hjx-app / PresonalCenter

Download as
Browse Code »

Commit 522aba51246c4e675328f8b29e345eb60a01e831

Authored by xiongwei
1 parent 1671ec5d6d
Exists in master

修复个人中心问题

Showing 28 changed files with 390 additions and 223 deletions   Show diff stats
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java
Diff comments   View file @522aba5
... ... @@ -103,8 +103,6 @@ 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);
107   -
108 106 initView();
109 107 initData();
110 108 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeBangDingActivity.java
Diff comments   View file @522aba5
... ... @@ -14,6 +14,5 @@ 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);
18 17 }
19 18 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeEletronicCardPhoneActivity.java
Diff comments   View file @522aba5
... ... @@ -16,6 +16,5 @@ 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);
20 19 }
21 20 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePasswordActivity.java
Diff comments   View file @522aba5
... ... @@ -29,7 +29,6 @@ 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);
33 32 initView();
34 33 setLister();
35 34 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java
Diff comments   View file @522aba5
... ... @@ -40,7 +40,6 @@ public class ChangePresonalInfoActivity extends AppCompatActivity {
40 40 protected void onCreate(Bundle savedInstanceState) {
41 41 super.onCreate(savedInstanceState);
42 42 setContentView(R.layout.activity_change_preson_info);
43   - SysApplication.getInstance().addActivity(this);
44 43 initView();
45 44 initData();
46 45  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java
Diff comments   View file @522aba5
... ... @@ -69,6 +69,12 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
69 69 overridePendingTransition(R.anim.rightin, R.anim.rightout);
70 70 } else if (status.equals("2001")) {
71 71 ElectronicCardDialog.getInstance().show(getSupportFragmentManager(), "ElectronicCardDialog");
  72 + } else if (status.equals("2002")) {
  73 + AlertUtils.showToast(ChoiseTextBookActivity.this, "您的机器为样机，可直接使用！");
  74 + Intent intent = new Intent();
  75 + intent.setClass(ChoiseTextBookActivity.this, TheStartPageActivity.class);
  76 + ChoiseTextBookActivity.this.startActivity(intent);
  77 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
72 78 }
73 79  
74 80 } catch (JSONException e) {
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java
Diff comments   View file @522aba5
... ... @@ -64,7 +64,6 @@ 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);
68 67 initView();
69 68 initData();
70 69 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
Diff comments   View file @522aba5
... ... @@ -136,15 +136,15 @@ public class ElectronicCardValidationActivity extends AppCompatActivity implemen
136 136 AlertUtils.showToast(ElectronicCardValidationActivity.this, "您输入的验证码不正确");
137 137 }else {
138 138 String userID = SaveParam.getInstance().getLoginParam(this,"userId");
139   - int auserID = 0;
  139 + Long auserID = null;
140 140 try {
141   - auserID = Integer.parseInt(userID);
  141 + auserID = Long.parseLong(userID);
142 142 } catch (NumberFormatException e) {
143 143 e.printStackTrace();
144 144 }
145 145 if (Content.authcodeflag==1){
146 146 //修改账户手机号
147   - HttpManager.getInstance().changecardinfophone(this,
  147 + HttpManager.getInstance().changeaccountphone(this,
148 148 auserID,usernameStr,authcodeStr);
149 149  
150 150 }else if (Content.authcodeflag==2){
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/FeedBackActivity.java
Diff comments   View file @522aba5
... ... @@ -63,7 +63,6 @@ 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);
67 66 initView();
68 67 initData();
69 68 initLister();
... ... @@ -204,9 +203,9 @@ public class FeedBackActivity extends AppCompatActivity implements View.OnClickL
204 203 newUri = data.getData();
205 204 }
206 205 if (newUri != null) {
207   - uploadAvatarFromPhoto();
  206 + //uploadAvatarFromPhoto();
208 207 //裁剪图片
209   - //startPhotoZoom(newUri);
  208 + startPhotoZoom(newUri);
210 209 } else {
211 210 Toast.makeText(this, "没有得到相册图片", Toast.LENGTH_LONG).show();
212 211 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java
Diff comments   View file @522aba5
... ... @@ -113,7 +113,6 @@ 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);
117 116 initView();
118 117 setLister();
119 118 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/LoginAndRegisterActivity.java
Diff comments   View file @522aba5
... ... @@ -109,7 +109,7 @@ public class LoginAndRegisterActivity extends AppCompatActivity {
109 109 //给ViewPager设置适配器
110 110 viewPager.setAdapter(logindapter);
111 111 //设置滑动时数据不丢失
112   - viewPager.setOffscreenPageLimit(1);
  112 + viewPager.setOffscreenPageLimit(0);
113 113 //将TabLayout和ViewPager关联起来。
114 114 }
115 115  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @522aba5
... ... @@ -14,7 +14,6 @@ import android.support.v4.content.FileProvider;
14 14 import android.support.v7.app.AppCompatActivity;
15 15 import android.support.v7.widget.LinearLayoutManager;
16 16 import android.support.v7.widget.RecyclerView;
17   -import android.util.Log;
18 17 import android.view.KeyEvent;
19 18 import android.view.View;
20 19 import android.widget.ImageView;
... ... @@ -56,6 +55,9 @@ import com.mylhyl.circledialog.view.listener.OnInputClickListener;
56 55 import com.zaaach.toprightmenu.MenuItem;
57 56 import com.zaaach.toprightmenu.TopRightMenu;
58 57  
  58 +import org.json.JSONException;
  59 +import org.json.JSONObject;
  60 +
59 61 import java.io.File;
60 62 import java.io.UnsupportedEncodingException;
61 63 import java.util.ArrayList;
... ... @@ -65,7 +67,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
65 67 private ImageView iv_imformatioan, iv_look_card, iv_setting, iv_sign, iv_sex;
66 68 private TextView tv_edit_presoninfo, tv_sign,
67 69 tv_username, tv_username1, tv_mygad, tv_sex, tv_useinfo_adress, tv_useinfo_birthday,
68   - tv_useinfo_qq, tv_useinfo_school, tv_useinfo_gender;
  70 + tv_useinfo_qq, tv_useinfo_school, tv_useinfo_gender, tv_yangji;
69 71 private LinearLayout linel_mycuoti, linel_mynote, linel_mycollege, linel_myclass;
70 72 private TopRightMenu mTopRightMenu;
71 73 //水平滑动
... ... @@ -85,13 +87,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
85 87 SimpleDraweeView mSimpleDraweeView;
86 88 private File file;
87 89 private Uri uri;
88   - Handler handler = new Handler(){
  90 + Handler handler = new Handler() {
89 91 @Override
90 92 public void handleMessage(Message msg) {
91 93 super.handleMessage(msg);
92   - switch (msg.what){
  94 + switch (msg.what) {
93 95 case HttpCode.GETINFO:
94   - PesonalInfo.DataBean cardinfoBean =(PesonalInfo.DataBean)msg.obj;
  96 + PesonalInfo.DataBean cardinfoBean = (PesonalInfo.DataBean) msg.obj;
95 97 tv_username.setText(cardinfoBean.getNickName());
96 98 tv_username1.setText(cardinfoBean.getNickName());
97 99 tv_useinfo_adress.setText(cardinfoBean.getRegion().getRegionName());
... ... @@ -100,33 +102,33 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
100 102 tv_useinfo_school.setText(cardinfoBean.getSchool().getSchoolName());
101 103 tv_useinfo_gender.setText(cardinfoBean.getGrade().getGradeName());
102 104 String sex = cardinfoBean.getGender();
103   - if ("0".equals(sex)){
  105 + if ("0".equals(sex)) {
104 106 tv_sex.setText("男");
105 107 iv_sex.setImageResource(R.mipmap.men);
106   - }else {
  108 + } else {
107 109 tv_sex.setText("女");
108 110 iv_sex.setImageResource(R.mipmap.women);
109 111 }
110 112 mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait());
111   - String graderID =cardinfoBean.getGrade().getGradeId();
112   - String userID = SaveParam.getInstance().getLoginParam(MainActivity.this,"userId");
  113 + String graderID = cardinfoBean.getGrade().getGradeId();
  114 + String userID = SaveParam.getInstance().getLoginParam(MainActivity.this, "userId");
113 115 //账户类型
114   - String accounts = SaveParam.getInstance().getCustomizeParam(MainActivity.this,SaveParam.ACCOUNT);
115   - String childID = SaveParam.getInstance().getCustomizeParam(MainActivity.this,SaveParam.CHILDSID);
116   - SaveParam.getInstance().saveCustomizeParam(MainActivity.this, SaveParam.GRADENS, ""+graderID);
  116 + String accounts = SaveParam.getInstance().getCustomizeParam(MainActivity.this, SaveParam.ACCOUNT);
  117 + String childID = SaveParam.getInstance().getCustomizeParam(MainActivity.this, SaveParam.CHILDSID);
  118 + SaveParam.getInstance().saveCustomizeParam(MainActivity.this, SaveParam.GRADENS, "" + graderID);
117 119 try {
118 120 Object auserID;
119 121 int type;
120   - int graderIDs =Integer.parseInt(graderID);
121   - if ("2".equals(accounts)){
122   - type=Integer.parseInt(accounts);
123   - auserID =childID;
124   - }else {
125   - type =Integer.parseInt(accounts);
126   - auserID =Long.parseLong(userID);
  122 + int graderIDs = Integer.parseInt(graderID);
  123 + if ("2".equals(accounts)) {
  124 + type = Integer.parseInt(accounts);
  125 + auserID = childID;
  126 + } else {
  127 + type = Integer.parseInt(accounts);
  128 + auserID = Long.parseLong(userID);
127 129 }
128 130 //获取版本信息
129   - HttpManager.getInstance().getpublishinfo(MainActivity.this,auserID,graderIDs,type,handler);
  131 + HttpManager.getInstance().getpublishinfo(MainActivity.this, auserID, graderIDs, type, handler);
130 132  
131 133 } catch (NumberFormatException e) {
132 134 e.printStackTrace();
... ... @@ -134,24 +136,55 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
134 136  
135 137 break;
136 138 case HttpCode.SIGN:
137   - SignInfo.DataBean dataBean = (SignInfo.DataBean)msg.obj;
138   - if (dataBean.getSignature()==null){
  139 + SignInfo.DataBean dataBean = (SignInfo.DataBean) msg.obj;
  140 + if (dataBean.getSignature() == null) {
139 141 tv_sign.setText("你还未设置个性签名");
140   - }else {
  142 + } else {
141 143 tv_sign.setText(dataBean.getSignature());
142 144 }
143 145  
144 146 break;
145 147 case HttpCode.PUBLISH_SUCESS:
146 148 defautPublishInfos.clear();
147   - defautPublishInfos.addAll( (List<DefautPublishInfo.DataBean>)msg.obj);
  149 + defautPublishInfos.addAll((List<DefautPublishInfo.DataBean>) msg.obj);
148 150 RecyclerViewadapterpublish.notifyDataSetChanged();
149 151 break;
150 152 case HttpCode.GETVIDIO_SUCESS:
151 153 videoinfo.clear();
152   - videoinfo.addAll( (List<VideoInfo.DataBean>)msg.obj);
  154 + videoinfo.addAll((List<VideoInfo.DataBean>) msg.obj);
153 155 RecyclerViewadapter.notifyDataSetChanged();
154 156 break;
  157 + case HttpCode.SUCHCARDINFOONE:
  158 + JSONObject jsonObject;
  159 + String status;
  160 + try {
  161 + jsonObject = new JSONObject((String) msg.obj);
  162 + status = jsonObject.getString("status");
  163 + if (status.equals("1")) {
  164 + tv_yangji.setVisibility(View.GONE);
  165 + iv_look_card.setVisibility(View.VISIBLE);
  166 + } else if (status.equals("2001")) {
  167 + tv_yangji.setVisibility(View.GONE);
  168 + iv_look_card.setVisibility(View.VISIBLE);
  169 + AlertUtils.showToast(MainActivity.this, "您的机器还没有保卡信息，请重新登录");
  170 + SaveParam.getInstance().clearData(MainActivity.this);
  171 + Intent settingintent = new Intent();
  172 + settingintent.setClass(MainActivity.this, LoginAndRegisterActivity.class);
  173 + startActivity(settingintent);
  174 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  175 + finish();
  176 + } else if (status.equals("2002")) {
  177 + iv_look_card.setVisibility(View.GONE);
  178 + tv_yangji.setVisibility(View.VISIBLE);
  179 +
  180 + } else {
  181 + AlertUtils.showToast(MainActivity.this, "服务器连接失败");
  182 + }
  183 + } catch (JSONException e) {
  184 + e.printStackTrace();
  185 + }
  186 +
  187 +
155 188 }
156 189 }
157 190 };
... ... @@ -161,16 +194,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
161 194 super.onCreate(savedInstanceState);
162 195 Fresco.initialize(this);
163 196 setContentView(R.layout.activity_main);
164   - SysApplication.getInstance().addActivity(this);
165 197 initView();
166 198 initData();
167 199 initLister();
168 200 updateVersion();
169   - String devicenumber = GetDevicesUtil.getDevicesInfo(this).getDeviceNumber();
170   - String model = GetDevicesUtil.getDevicesInfo(this).getDeviceModel();
171   - Log.e("test","......."+devicenumber+model);
172 201 }
173   -//////版本更新
  202 +
  203 + //////版本更新
174 204 private void updateVersion() {
175 205 UpdateChecker updateChecker = new UpdateChecker(this);
176 206 updateChecker.checkForUpdates();
... ... @@ -198,6 +228,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
198 228 tv_useinfo_qq = (TextView) findViewById(R.id.tv_useinfo_qq);
199 229 tv_useinfo_school = (TextView) findViewById(R.id.tv_useinfo_school);
200 230 tv_useinfo_gender = (TextView) findViewById(R.id.tv_useinfo_gender);
  231 + tv_yangji = (TextView) findViewById(R.id.tv_yangji);
201 232 //跳转其他应用
202 233 linel_mycuoti = (LinearLayout) findViewById(R.id.linel_mycuoti);
203 234 linel_mynote = (LinearLayout) findViewById(R.id.linel_mynote);
... ... @@ -205,7 +236,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
205 236 linel_myclass = (LinearLayout) findViewById(R.id.linel_myclass);
206 237 //
207 238 mRecyclerView = (RecyclerView) findViewById(R.id.id_recyclerview_horizontal);
208   - mRecyclerViewpublish =(RecyclerView) findViewById(R.id.id_recyclerview_pubish);
  239 + mRecyclerViewpublish = (RecyclerView) findViewById(R.id.id_recyclerview_pubish);
209 240  
210 241 }
211 242  
... ... @@ -225,19 +256,29 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
225 256 mRecyclerViewpublish.addItemDecoration(new RecyclerViewSpaceItem(10));
226 257  
227 258 //设置视频适配器
228   - RecyclerViewadapter = new VideoAdapter(this,videoinfo);
229   - RecyclerViewadapterpublish= new GalleryAdapter(this,defautPublishInfos);
  259 + RecyclerViewadapter = new VideoAdapter(this, videoinfo);
  260 + RecyclerViewadapterpublish = new GalleryAdapter(this, defautPublishInfos);
230 261  
231 262 //版本信息适配器
232 263 mRecyclerView.setAdapter(RecyclerViewadapter);
233 264 mRecyclerViewpublish.setAdapter(RecyclerViewadapterpublish);
234   - String userID = SaveParam.getInstance().getLoginParam(this,"userId");
  265 + //判断保卡信息是否为样机
  266 + String yangji = SaveParam.getInstance().getLoginParam(this, SaveParam.YANGJI);
  267 + String deviceNumber = GetDevicesUtil.getDevicesInfo(MainActivity.this).getDeviceNumber();
  268 + if ("1".equals(yangji)) {
  269 + iv_look_card.setVisibility(View.GONE);
  270 + tv_yangji.setVisibility(View.VISIBLE);
  271 + } else {
  272 + HttpManager.getInstance().getcardinfo1(this, deviceNumber, handler);
  273 +
  274 + }
  275 + String userID = SaveParam.getInstance().getLoginParam(this, "userId");
235 276 //获取个性签名
236   - String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT);
  277 + String typeaccount = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT);
237 278 try {
238 279 long auserID = Long.parseLong(userID);
239   - int typeaccount1=Integer.parseInt(typeaccount);
240   - HttpManager.getInstance().getsignatures(MainActivity.this,auserID,typeaccount1,handler);
  280 + int typeaccount1 = Integer.parseInt(typeaccount);
  281 + HttpManager.getInstance().getsignatures(MainActivity.this, auserID, typeaccount1, handler);
241 282  
242 283 } catch (NumberFormatException e) {
243 284 e.printStackTrace();
... ... @@ -245,7 +286,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
245 286  
246 287 //初始化图片
247 288 file = new File(FileUtil.getCachePath(this), "user-avatar.jpg");
248   - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
  289 + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
249 290 uri = Uri.fromFile(file);
250 291 } else {
251 292 //通过FileProvider创建一个content类型的Uri(android 7.0需要这样的方法跨应用访问)
... ... @@ -362,11 +403,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
362 403 AlertUtils.showToast(MainActivity.this, "请输入个性签名");
363 404 } else {
364 405 try {
365   - String typeaccount = SaveParam.getInstance().getCustomizeParam(MainActivity.this,SaveParam.ACCOUNT);
366   - String userID = SaveParam.getInstance().getLoginParam(MainActivity.this,"userId");
  406 + String typeaccount = SaveParam.getInstance().getCustomizeParam(MainActivity.this, SaveParam.ACCOUNT);
  407 + String userID = SaveParam.getInstance().getLoginParam(MainActivity.this, "userId");
367 408 long auserID = Long.parseLong(userID);
368   - int typeaccount1=Integer.parseInt(typeaccount);
369   - HttpManager.getInstance().changsignature(MainActivity.this,auserID,typeaccount1,text);
  409 + int typeaccount1 = Integer.parseInt(typeaccount);
  410 + HttpManager.getInstance().changsignature(MainActivity.this, auserID, typeaccount1, text);
370 411 } catch (NumberFormatException e) {
371 412 e.printStackTrace();
372 413 }
... ... @@ -379,43 +420,47 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
379 420 .show();
380 421 break;
381 422 case R.id.linel_mycuoti:
382   - AlertUtils.showToast(this, "hhahahah ");
  423 + AlertUtils.showToast(this, "我的错题 ");
383 424 break;
384 425 case R.id.linel_mynote:
385   - AlertUtils.showToast(this, "hhahahah ");
  426 + AlertUtils.showToast(this, "我的笔记 ");
386 427 break;
387 428 case R.id.linel_mycollege:
388   - AlertUtils.showToast(this, "hhahahah ");
  429 + AlertUtils.showToast(this, "我的收藏 ");
389 430 break;
390 431 case R.id.linel_myclass:
391   - AlertUtils.showToast(this, "hhahahah ");
  432 + AlertUtils.showToast(this, "我的班级 ");
392 433 break;
393 434 }
394 435  
395 436 }
396 437  
397 438 @Override
  439 + protected void onPause() {
  440 + super.onPause();
  441 + }
  442 +
  443 + @Override
398 444 protected void onResume() {
399 445 super.onResume();
400   - String userID = SaveParam.getInstance().getLoginParam(this,"userId");
  446 + String userID = SaveParam.getInstance().getLoginParam(this, "userId");
401 447 //账户类型
402   - String accounts = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT);
  448 + String accounts = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT);
403 449 //加载个人信息
404   - String xiongzuo = SaveParam.getInstance().getLoginParam(this,SaveParam.CONSTELLATION);
405   - if (xiongzuo==null){
  450 + String xiongzuo = SaveParam.getInstance().getLoginParam(this, SaveParam.CONSTELLATION);
  451 + if (xiongzuo == null) {
406 452 tv_mygad.setText("");
407   - }else {
  453 + } else {
408 454 tv_mygad.setText(xiongzuo);
409 455 }
410 456 try {
411 457 int graderID;
412 458 long auserID = Long.parseLong(userID);
413   - int typeaccount1=Integer.parseInt(accounts);
  459 + int typeaccount1 = Integer.parseInt(accounts);
414 460 //获取最近播放视频
415   - HttpManager.getInstance().getstuyvidioinfo(this,auserID,handler);
  461 + HttpManager.getInstance().getstuyvidioinfo(this, auserID, handler);
416 462 //获取个人信息
417   - HttpManager.getInstance().getpresonalinfo(MainActivity.this,auserID,typeaccount1,handler);
418   -
  463 + HttpManager.getInstance().getpresonalinfo(MainActivity.this, auserID, typeaccount1, handler);
419 464  
420 465  
421 466 } catch (NumberFormatException e) {
... ... @@ -426,52 +471,58 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
426 471  
427 472 //回调头像监听
428 473 @Override
429   - public void heard(Context context, View v,int headpitiaon) {
  474 + public void heard(Context context, View v, int headpitiaon) {
430 475 String picUrl = "";
431   - String userID = SaveParam.getInstance().getLoginParam(this,"userId");
432   - String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT);
433   - switch (v.getId()){
  476 + String userID;
  477 + String typeaccount = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT);
  478 + if ("2".equals(typeaccount)) {
  479 + userID = SaveParam.getInstance().getCustomizeParam(this, SaveParam.CHILDSID);
  480 + } else {
  481 + userID = SaveParam.getInstance().getLoginParam(this, "userId");
  482 + }
  483 + switch (v.getId()) {
434 484 //选择默认图片
435 485 case R.id.oktakephone:
436   - if (headpitiaon==1){
  486 + if (headpitiaon == 1) {
437 487 mSimpleDraweeView.setImageDrawable(null);
438 488 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar1);
439 489 picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/61e8d8cf-651f-49c9-beb2-ff1387af390a.png";
440 490 try {
441   - HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl);
  491 + HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
442 492 } catch (UnsupportedEncodingException e) {
443 493 e.printStackTrace();
444 494 }
445   - }else if (headpitiaon==2){
  495 + } else if (headpitiaon == 2) {
446 496 mSimpleDraweeView.setImageDrawable(null);
447 497 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar2);
448 498 picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/8480ff7b-42f1-4d64-b848-c8f4f3afd385.png";
449 499 try {
450   - HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl);
  500 + HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
451 501 } catch (UnsupportedEncodingException e) {
452 502 e.printStackTrace();
453 503 }
454   - }else if (headpitiaon==3){
  504 + } else if (headpitiaon == 3) {
455 505 mSimpleDraweeView.setImageDrawable(null);
456 506 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar3);
457 507 picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/184112f4-bfe0-4db8-bc1e-6212755b241c.png";
458 508 try {
459   - HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl);
  509 + HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
460 510 } catch (UnsupportedEncodingException e) {
461 511 e.printStackTrace();
462 512 }
463   - }else if (headpitiaon==4){
  513 + } else if (headpitiaon == 4) {
464 514 mSimpleDraweeView.setImageDrawable(null);
465 515 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar4);
466 516 picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/e31c9e11-9276-4bf4-a162-b66272fdc351.png";
467 517 try {
468   - HttpManager.getInstance().headerdeft(this, userID,typeaccount,picUrl);
  518 + HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
469 519 } catch (UnsupportedEncodingException e) {
470 520 e.printStackTrace();
471 521 }
472   - }else{
  522 + } else {
473 523 mSimpleDraweeView.setImageDrawable(null);
474   - mSimpleDraweeView.setImageResource(R.mipmap.header_default);;
  524 + mSimpleDraweeView.setImageResource(R.mipmap.header_default);
  525 + ;
475 526 }
476 527  
477 528 break;
... ... @@ -480,10 +531,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
480 531 break;
481 532 //拍摄和相册
482 533 case R.id.take_pic:
  534 + android.util.Log.e("TAG", ".....");
483 535 if (PermissionUtil.hasCameraPermission(MainActivity.this)) {
484 536 uploadAvatarFromPhotoRequest();
485 537 }
486   -
487 538 break;
488 539 case R.id.xiangce:
489 540 uploadAvatarFromAlbumRequest();
... ... @@ -508,6 +559,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
508 559 photoPickerIntent.setType("image/*");
509 560 startActivityForResult(photoPickerIntent, REQUEST_CODE_ALBUM);
510 561 }
  562 +
511 563 //回掉
512 564 @Override
513 565 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
... ... @@ -538,6 +590,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
538 590 compressAndUploadAvatar(file.getPath());
539 591  
540 592 }
  593 +
541 594 private void compressAndUploadAvatar(String fileSrc) {
542 595  
543 596  
... ... @@ -547,13 +600,18 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
547 600 String mimeType = "image/*";
548 601 //requestBody = RequestBody.create(MediaType.parse(mimeType), file);
549 602 //String fileName = cover.getName();
550   - String userID = SaveParam.getInstance().getLoginParam(this,"userId");
551   - String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT);
  603 + String userID;
  604 + String typeaccount = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT);
  605 + if ("2".equals(typeaccount)) {
  606 + userID = SaveParam.getInstance().getCustomizeParam(this, SaveParam.CHILDSID);
  607 + } else {
  608 + userID = SaveParam.getInstance().getLoginParam(this, "userId");
  609 + }
552 610  
553   - //上传头像
  611 + //上传头像
554 612  
555 613 try {
556   - HttpManager.getInstance().header(this, userID,typeaccount,file.getPath());
  614 + HttpManager.getInstance().header(this, userID, typeaccount, file.getPath());
557 615 } catch (UnsupportedEncodingException e) {
558 616 e.printStackTrace();
559 617 }
... ... @@ -617,7 +675,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
617 675 super.onRequestPermissionsResult(requestCode, permissions, grantResults);
618 676 }
619 677 }
  678 +
620 679 private long exitTime = 0;
  680 +
621 681 @Override
622 682 public boolean onKeyDown(int keyCode, KeyEvent event) {
623 683 if (keyCode == KeyEvent.KEYCODE_BACK) {
... ... @@ -626,7 +686,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
626 686 Toast.LENGTH_SHORT).show();
627 687 exitTime = System.currentTimeMillis();
628 688 } else {
629   - SysApplication.getInstance().exit();
  689 + moveTaskToBack(false);//应用退到后台
  690 + System.exit(0);
630 691 }
631 692 return false;
632 693 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java
Diff comments   View file @522aba5
... ... @@ -117,8 +117,8 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl
117 117 String userID = SaveParam.getInstance().getLoginParam(this, "userId");
118 118 String grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS);
119 119 String School = SaveParam.getInstance().getLoginParam(this, SaveParam.SCHOOOlID);
120   - String regionId = SaveParam.getInstance().getLoginParam(this, SaveParam.COUNTRY);
121   - String regionId1 = SaveParam.getInstance().getLoginParam(this, SaveParam.CITYS);
  120 + String regionId = SaveParam.getInstance().getsaveCityParam(this, SaveParam.COUNTRY);
  121 + String regionId1 = SaveParam.getInstance().getsaveCityParam(this, SaveParam.CITYS);
122 122 String devicenumber = GetDevicesUtil.getDevicesInfo(this).getDeviceNumber();
123 123 if (regionId == null) {
124 124 regionId = regionId1;
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java
Diff comments   View file @522aba5
... ... @@ -45,7 +45,7 @@ public class TheStartPageActivity extends AppCompatActivity implements View.OnCl
45 45 intent.setClass(TheStartPageActivity.this,MainActivity.class);
46 46 startActivity(intent);
47 47 overridePendingTransition(R.anim.rightin, R.anim.rightout);
48   - finish();
  48 + SysApplication.getInstance().exit();
49 49 break;
50 50 }
51 51 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CitysListDialog.java
Diff comments   View file @522aba5
... ... @@ -6,6 +6,7 @@ import android.graphics.Color;
6 6 import android.os.Bundle;
7 7 import android.os.Handler;
8 8 import android.os.Message;
  9 +import android.util.Log;
9 10 import android.view.Gravity;
10 11 import android.view.LayoutInflater;
11 12 import android.view.View;
... ... @@ -84,7 +85,7 @@ public class CitysListDialog extends BaseCircleDialog implements AdapterView.OnI
84 85 super.onActivityCreated(savedInstanceState);
85 86 listView = (ListView) getView().findViewById(R.id.listadapter);
86 87 cance = (ImageView) getView().findViewById(R.id.cancel);
87   - String citys = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.PROVINCES);
  88 + String citys = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.PROVINCES);
88 89 listadapter = new CitysAdapter(data,getActivity());
89 90 listView.setAdapter(listadapter);
90 91 listView.setOnItemClickListener(this);
... ... @@ -106,7 +107,8 @@ public class CitysListDialog extends BaseCircleDialog implements AdapterView.OnI
106 107  
107 108 @Override
108 109 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
109   - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.CITYS, ""+data.get(position).getRegionId());
  110 + SaveParam.getInstance().saveCityParam(getActivity(), SaveParam.CITYS, ""+data.get(position).getRegionId());
  111 + Log.e("test","CITYS"+data.get(position).getRegionId());
110 112 mCallBack.province1OnItemClick(data,position,2);
111 113 dismiss();
112 114  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/CountryDialog.java
Diff comments   View file @522aba5
... ... @@ -78,7 +78,7 @@ public class CountryDialog extends BaseCircleDialog implements AdapterView.OnIte
78 78 super.onActivityCreated(savedInstanceState);
79 79 listView = (ListView) getView().findViewById(R.id.listadapter);
80 80 cance = (ImageView) getView().findViewById(R.id.cancel);
81   - String citys = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS);
  81 + String citys = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS);
82 82 listadapter = new CountryAdapter(data,getActivity());
83 83 listView.setAdapter(listadapter);
84 84 listView.setOnItemClickListener(this);
... ... @@ -100,7 +100,7 @@ public class CountryDialog extends BaseCircleDialog implements AdapterView.OnIte
100 100  
101 101 @Override
102 102 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
103   - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.COUNTRY, ""+data.get(position).getRegionId());
  103 + SaveParam.getInstance().saveCityParam(getActivity(), SaveParam.COUNTRY, ""+data.get(position).getRegionId());
104 104 mCallBack.province2OnItemClick(data,position,3);
105 105 dismiss();
106 106  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ProvinceListDialog.java
Diff comments   View file @522aba5
... ... @@ -95,7 +95,8 @@ public class ProvinceListDialog extends BaseCircleDialog implements AdapterView.
95 95 @Override
96 96 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
97 97 //Toast.makeText(getActivity(), "你点击了第" + position + "个", Toast.LENGTH_LONG).show();
98   - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.PROVINCES, ""+data.get(position).getRegionId());
  98 + SaveParam.getInstance().clearsaveCityParam(getActivity());
  99 + SaveParam.getInstance().saveCityParam(getActivity(), SaveParam.PROVINCES, ""+data.get(position).getRegionId());
99 100 mCallBack.provinceOnItemClick(data,position,1);
100 101 dismiss();
101 102  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java
Diff comments   View file @522aba5
... ... @@ -8,6 +8,7 @@ import android.os.Handler;
8 8 import android.os.Message;
9 9 import android.text.Editable;
10 10 import android.text.TextWatcher;
  11 +import android.util.Log;
11 12 import android.view.Gravity;
12 13 import android.view.LayoutInflater;
13 14 import android.view.View;
... ... @@ -93,7 +94,11 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On
93 94 school_list = (ListView) getView().findViewById(R.id.listschooladapter);
94 95 school_sech = (EditText) getView().findViewById(R.id.et_school_sech);
95 96 cance = (ImageView) getView().findViewById(R.id.cancel);
96   - String citys = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS);
  97 + String citys = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS);
  98 + String country = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY);
  99 + if (country==null){
  100 + country =citys;
  101 + }
97 102 String grade = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.GRADENS);
98 103 listadapter = new SchoolAdapter(data, getActivity());
99 104 school_list.setAdapter(listadapter);
... ... @@ -105,8 +110,9 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On
105 110 }
106 111 });
107 112 try {
108   - int a = Integer.parseInt(citys);
  113 + int a = Integer.parseInt(country);
109 114 int b = Integer.parseInt(grade);
  115 + Log.e("test","地区ID"+country+"年级ID"+grade);
110 116 HttpManager.getInstance().getschool(getActivity(),a,b,handler);
111 117 } catch (NumberFormatException e) {
112 118 e.printStackTrace();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
Diff comments   View file @522aba5
... ... @@ -42,7 +42,8 @@ public class SaveParam {
42 42 public static String ACCOUNT = "account";//账户类型
43 43 //科目信息
44 44 public static String SUBJECT = "subject";
45   - //科目出版社
  45 + //样机
  46 + public static String YANGJI = "yangji";
46 47 //图片URL
47 48 public static String IMGURL = "imgurl";
48 49 //版本名称
... ... @@ -89,4 +90,24 @@ public class SaveParam {
89 90 Activity.MODE_PRIVATE);
90 91 sp.edit().clear().commit();
91 92 }
  93 + public void saveCityParam(Context context,String spname, String spstr) {
  94 + SharedPreferences sp = context.getSharedPreferences("saveCityParam",
  95 + Activity.MODE_PRIVATE);
  96 +
  97 + sp.edit().putString(spname, spstr).commit();
  98 +
  99 + }
  100 +
  101 + public String getsaveCityParam(Context context,String spname) {
  102 + SharedPreferences sp = context.getSharedPreferences("saveCityParam",
  103 + Activity.MODE_PRIVATE);
  104 + String param = sp.getString(spname, null);
  105 + return param;
  106 + }
  107 +
  108 + public void clearsaveCityParam(Context context ){
  109 + SharedPreferences sp = context.getSharedPreferences("saveCityParam",
  110 + Activity.MODE_PRIVATE);
  111 + sp.edit().clear().commit();
  112 + }
92 113 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java
Diff comments   View file @522aba5
... ... @@ -140,6 +140,13 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
140 140 getActivity().startActivity(intent);
141 141 getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
142 142  
  143 + } else if (status.equals("2002")) {
  144 + SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.YANGJI, "1");
  145 + SaveParam.getInstance().saveLoginParam(getActivity(), "login", "true");
  146 + Intent intent = new Intent();
  147 + intent.setClass(getActivity(), MainActivity.class);
  148 + getActivity().startActivity(intent);
  149 + getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
143 150 } else if (status.equals("2001")) {
144 151 ElectronicCardDialog.getInstance().show(getChildFragmentManager(), "ElectronicCardDialog");
145 152 } else {
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
Diff comments   View file @522aba5
... ... @@ -224,10 +224,10 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
224 224 //保存星座
225 225 BrithdayStar brithdayStar = new BrithdayStar();
226 226 String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString());
227   - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.CONSTELLATION, s);
  227 + SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.CONSTELLATION, s);
228 228  
229   - String regionId = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.COUNTRY);
230   - String regionId1 = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS);
  229 + String regionId = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY);
  230 + String regionId1 = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS);
231 231 if (regionId == null) {
232 232 regionId = regionId1;
233 233 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java
Diff comments   View file @522aba5
... ... @@ -53,6 +53,8 @@ public class HttpCode {
53 53 public static final int REGISTERINFO_SUCESS = 25;
54 54 //获取视频信息
55 55 public static final int GETVIDIO_SUCESS = 26;
  56 + //查询保卡信息1
  57 + public static final int SUCHCARDINFOONE = 27;
56 58  
57 59  
58 60  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
Diff comments   View file @522aba5
... ... @@ -298,13 +298,13 @@ public class HttpManager {
298 298 if (status.equals("1")) {
299 299 Log.e("test", "onSuccess" + jsonObject);
300 300 Toast.makeText(context, "保卡绑定成功！", Toast.LENGTH_LONG).show();
301   - if (Content.cardintentflag ==1){
  301 + if (Content.cardintentflag == 1) {
302 302 Intent intent = new Intent();
303 303 intent.setClass((Activity) context, TheStartPageActivity.class);
304 304 ((Activity) context).startActivity(intent);
305 305 ((Activity) context).overridePendingTransition(R.anim.rightin, R.anim.rightout);
306 306 ((Activity) context).finish();
307   - }else if (Content.cardintentflag ==2){
  307 + } else if (Content.cardintentflag == 2) {
308 308 Intent intent = new Intent();
309 309 intent.setClass((Activity) context, BangDingCode.class);
310 310 ((Activity) context).startActivity(intent);
... ... @@ -376,6 +376,69 @@ public class HttpManager {
376 376 });
377 377 }
378 378  
  379 + //获取是否为样机信息
  380 + public void getcardinfo1(final Context mContext, String deviceNumber, final Handler handler) {
  381 + HttpClient.getInstance().setTimeout(5 * 1000);
  382 + HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
  383 + HttpClient.getInstance().get(HttpUrl.getcardinfo + "?deviceNumber=" + deviceNumber, new AsyncHttpResponseHandler() {
  384 + @Override
  385 + public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
  386 + closeProgress();
  387 + Log.e("test", "保卡信息" + new String(arg2));
  388 + Message msg = Message.obtain();
  389 + msg.what = HttpCode.SUCHCARDINFOONE;
  390 + msg.obj = new String(arg2);
  391 + handler.sendMessage(msg);
  392 +
  393 + }
  394 +
  395 + @Override
  396 + public void onFailure(int arg0, Header[] arg1, byte[] arg2, Throwable arg3) {
  397 + closeProgress();
  398 + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
  399 + }
  400 + });
  401 + }
  402 +
  403 + //修改账户电话
  404 + public void changeaccountphone(final Context mContext, long userId, final String username, String authCode) {
  405 + RequestParams params = new RequestParams();
  406 + params.put("userId", userId);
  407 + params.put("username", username);
  408 + params.put("authCode", authCode);
  409 + HttpClient.getInstance().addHeader("Accept", "*/*");
  410 + HttpClient.getInstance().post(HttpUrl.chageaccountphoneURL, params, new AsyncHttpResponseHandler() {
  411 + @Override
  412 + public void onSuccess(int i, Header[] headers, byte[] bytes) {
  413 + try {
  414 + Log.e("test", "保卡信息" + new String(bytes));
  415 + JSONObject jsonObject = new JSONObject(new String(bytes));
  416 + String status = jsonObject.optString("status");
  417 + if (status.equals("1")) {
  418 + Toast.makeText(mContext, "手机号修改成功", Toast.LENGTH_LONG).show();
  419 + SaveParam.getInstance().saveLoginParam(mContext, "username", username);
  420 + ((Activity) mContext).finish();
  421 + } else if (status.equals("1001")) {
  422 + Toast.makeText(mContext, "验证码输入错误", Toast.LENGTH_LONG).show();
  423 + }
  424 + else if (status.equals("1006")) {
  425 + AlertUtils.showToast(mContext, "该手机号已存在，请使用其他手机号重新绑定!");
  426 + } else {
  427 + AlertUtils.showToast(mContext, "您好，服务器异常，请稍后重试");
  428 + }
  429 + } catch (JSONException e) {
  430 + e.printStackTrace();
  431 + }
  432 + }
  433 +
  434 + @Override
  435 + public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
  436 + Log.e("test", "onFailure" + new String(bytes));
  437 + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
  438 + }
  439 + });
  440 + }
  441 +
379 442 //修改保卡信息电话
380 443 public void changecardinfophone(final Context mContext, long userId, final String customerPhone, String authCode) {
381 444 RequestParams params = new RequestParams();
... ... @@ -391,13 +454,7 @@ public class HttpManager {
391 454 String status = jsonObject.optString("status");
392 455 if (status.equals("1")) {
393 456 Toast.makeText(mContext, "手机号修改成功", Toast.LENGTH_LONG).show();
394   - if (Content.authcodeflag==2){
395   - SaveParam.getInstance().saveCustomizeParam(mContext, SaveParam.CARDPHONE, customerPhone);
396   - }else if (Content.authcodeflag==1){
397   - SaveParam.getInstance().saveLoginParam(mContext, "username", customerPhone);
398   - }else {
399   - AlertUtils.showToast(mContext, "修改未知的手机号");
400   - }
  457 + SaveParam.getInstance().saveCustomizeParam(mContext, SaveParam.CARDPHONE, customerPhone);
401 458 ((Activity) mContext).finish();
402 459 } else if (status.equals("1001")) {
403 460 Toast.makeText(mContext, "验证码输入错误", Toast.LENGTH_LONG).show();
... ... @@ -459,7 +516,7 @@ public class HttpManager {
459 516 HttpClient.getInstance().get(HttpUrl.cardcheck + "?deviceNumber=" + deviceNumber, new AsyncHttpResponseHandler() {
460 517 @Override
461 518 public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
462   - Log.e("test", "---" + new String(arg2));
  519 + Log.e("test", "验证保卡" + new String(arg2));
463 520 closeProgress();
464 521 Message msg = Message.obtain();
465 522 msg.what = HttpCode.CHECKCARD;
... ... @@ -656,11 +713,12 @@ public class HttpManager {
656 713  
657 714 });
658 715 }
  716 +
659 717 //提交注册信息
660 718 public void subregisterinfo(final Context mContext, Long userId
661   - , String name, int gradeId, long regionId, String regionName, Object schoolId,
662   - String math, String english, String physics, String chinese, String chemistry,
663   - String history, String geography, String political, String biology, String science, final Handler handler){
  719 + , String name, int gradeId, long regionId, String regionName, Object schoolId, String chinese,
  720 + String math, String english, String physics, String chemistry,
  721 + String history, String geography, String political, String biology, String science, final Handler handler) {
664 722 mProgress = DialogPermission.showProgress(mContext, null, "正在保存个人信息...",
665 723 false, true, null);
666 724 RequestParams params = new RequestParams();
... ... @@ -674,7 +732,6 @@ public class HttpManager {
674 732 params.put(HttpKey.MATH, math);
675 733 params.put(HttpKey.ENGLISH, english);
676 734 params.put(HttpKey.PHYSICES, physics);
677   - params.put(HttpKey.CHINESE, chinese);
678 735 params.put(HttpKey.CHEMISTRY, chemistry);
679 736 params.put(HttpKey.HISTIRY, history);
680 737 params.put(HttpKey.GEOGRAPHY, geography);
... ... @@ -706,10 +763,11 @@ public class HttpManager {
706 763  
707 764 });
708 765 }
  766 +
709 767 //修改版本信息
710 768 public void changepublishinfo(final Context mContext, String userId, String chinese,
711   - String math, String english, String physics, String chemistry,
712   - String history, String geography, String political, String biology, String science){
  769 + String math, String english, String physics, String chemistry,
  770 + String history, String geography, String political, String biology, String science) {
713 771 mProgress = DialogPermission.showProgress(mContext, null, "正在保存个人信息...",
714 772 false, true, null);
715 773 RequestParams params = new RequestParams();
... ... @@ -778,7 +836,7 @@ public class HttpManager {
778 836  
779 837 @Override
780 838 public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
781   - Log.e("test", "onFailure" + new String(bytes));
  839 + //Log.e("test", "onFailure" + new String(bytes));
782 840 AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
783 841 }
784 842 });
... ... @@ -824,7 +882,7 @@ public class HttpManager {
824 882  
825 883 @Override
826 884 public void onFailure(int arg0, Header[] arg1, byte[] arg2, Throwable arg3) {
827   - Log.e("test", "失败原因" + arg3);
  885 + //Log.e("test", "失败原因" + arg3);
828 886 AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
829 887 }
830 888 });
... ... @@ -846,48 +904,47 @@ public class HttpManager {
846 904 mProgress = DialogPermission.showProgress(mContext, null, "正在提交反馈内容...",
847 905 false, true, null);
848 906 File file = new File(imgs);
849   - if (file.exists() && file.length() > 0) {
850   - RequestParams params = new RequestParams();
851   - try {
852   - params.put("userId", userId);
853   - params.put("content", content);
854   - params.put("contact", contact);
  907 + RequestParams params = new RequestParams();
  908 + try {
  909 + params.put("userId", userId);
  910 + params.put("content", content);
  911 + params.put("contact", contact);
  912 + if (file.exists() && file.length() > 0) {
855 913 params.put("imgs", file);
856   - params.put("feedtype", feedtype);
857   - } catch (FileNotFoundException e) {
858   - e.printStackTrace();
859 914 }
860   - Log.e("test", "onSuccess" + params);
861   - HttpClient.getInstance().post(HttpUrl.feedbackURL, params, new AsyncHttpResponseHandler() {
862   - @Override
863   - public void onSuccess(int i, Header[] headers, byte[] bytes) {
864   - closeProgress();
865   - Log.e("test", "onSuccess" + new String(bytes));
866   - try {
867   - JSONObject jsonObject = new JSONObject(new String(bytes));
868   - String status = jsonObject.optString("status");
869   - if (status.equals("1")) {
870   - Toast.makeText(mContext, "您的宝贵意见已经提交成功。", Toast.LENGTH_LONG).show();
871   - ((Activity) mContext).finish();
872   - } else {
873   - AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
874   - }
875   - } catch (JSONException e) {
876   - e.printStackTrace();
  915 + params.put("feedtype", feedtype);
  916 + } catch (FileNotFoundException e) {
  917 + e.printStackTrace();
  918 + }
  919 + Log.e("test", "onSuccess" + params);
  920 + HttpClient.getInstance().post(HttpUrl.feedbackURL, params, new AsyncHttpResponseHandler() {
  921 + @Override
  922 + public void onSuccess(int i, Header[] headers, byte[] bytes) {
  923 + closeProgress();
  924 + Log.e("test", "onSuccess" + new String(bytes));
  925 + try {
  926 + JSONObject jsonObject = new JSONObject(new String(bytes));
  927 + String status = jsonObject.optString("status");
  928 + if (status.equals("1")) {
  929 + Toast.makeText(mContext, "您的宝贵意见已经提交成功。", Toast.LENGTH_LONG).show();
  930 + ((Activity) mContext).finish();
  931 + } else {
  932 + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
877 933 }
  934 + } catch (JSONException e) {
  935 + e.printStackTrace();
878 936 }
  937 + }
879 938  
880   - @Override
881   - public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
882   - closeProgress();
883   - Log.e("test", "错误信息" + new String(bytes));
884   - AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
  939 + @Override
  940 + public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
  941 + closeProgress();
  942 + //Log.e("test", "错误信息" + new String(bytes));
  943 + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
  944 +
  945 + }
  946 + });
885 947  
886   - }
887   - });
888   - } else {
889   - Toast.makeText(mContext, "文件不存在", Toast.LENGTH_LONG).show();
890   - }
891 948 }
892 949  
893 950 /**
... ... @@ -922,7 +979,7 @@ public class HttpManager {
922 979 msg.obj = schoolInfoBeanList;
923 980 handler.sendMessage(msg);
924 981  
925   - }else {
  982 + } else {
926 983 AlertUtils.showToast(mContext, "你好，服务器异常，请稍后再试!");
927 984  
928 985 }
... ... @@ -1158,9 +1215,9 @@ public class HttpManager {
1158 1215 try {
1159 1216 JSONObject jsonObject = new JSONObject(new String(bytes));
1160 1217 String status = jsonObject.optString("status");
1161   - JSONObject jsonObject1 =jsonObject.getJSONObject("data");
  1218 + JSONObject jsonObject1 = jsonObject.getJSONObject("data");
1162 1219 String imagUrl = jsonObject1.optString("imgUrl");
1163   - SaveParam.getInstance().saveLoginParam(mContext,SaveParam.HEADURL,imagUrl);
  1220 + SaveParam.getInstance().saveLoginParam(mContext, SaveParam.HEADURL, imagUrl);
1164 1221 if (status.equals("1")) {
1165 1222 Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show();
1166 1223 } else {
... ... @@ -1183,6 +1240,7 @@ public class HttpManager {
1183 1240 Toast.makeText(mContext, "文件不存在", Toast.LENGTH_LONG).show();
1184 1241 }
1185 1242 }
  1243 +
1186 1244 /**
1187 1245 * 头像默认
1188 1246 *
... ... @@ -1191,45 +1249,46 @@ public class HttpManager {
1191 1249 * @param
1192 1250 * @throws UnsupportedEncodingException
1193 1251 */
1194   - public void headerdeft(final Context mContext, String userId, String type,String defaultImg) throws UnsupportedEncodingException {
1195   - RequestParams params = new RequestParams();
1196   - params.put("userId", userId);
1197   - params.put("type", type);
1198   - params.put("defaultImg", defaultImg);
1199   - Log.e("test", "params" + params);
1200   - HttpClient.getInstance().setTimeout(5 * 1000);
1201   - HttpClient.getInstance().post(HttpUrl.headerdefaultURL, params, new AsyncHttpResponseHandler() {
1202   - @Override
1203   - public void onSuccess(int i, Header[] headers, byte[] bytes) {
1204   - Log.e("test", "onSuccess" + new String(bytes));
1205   - try {
1206   - JSONObject jsonObject = new JSONObject(new String(bytes));
1207   - String status = jsonObject.optString("status");
1208   - JSONObject jsonObject1 =jsonObject.getJSONObject("data");
1209   - String imagUrl = jsonObject1.optString("imgUrl");
1210   - SaveParam.getInstance().saveLoginParam(mContext,SaveParam.HEADURL,imagUrl);
1211   - if (status.equals("1")) {
1212   - Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show();
1213   - } else {
1214   - AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
1215   - }
1216   - } catch (JSONException e) {
1217   - e.printStackTrace();
  1252 + public void headerdeft(final Context mContext, String userId, String type, String defaultImg) throws UnsupportedEncodingException {
  1253 + RequestParams params = new RequestParams();
  1254 + params.put("userId", userId);
  1255 + params.put("type", type);
  1256 + params.put("defaultImg", defaultImg);
  1257 + Log.e("test", "params" + params);
  1258 + HttpClient.getInstance().setTimeout(5 * 1000);
  1259 + HttpClient.getInstance().post(HttpUrl.headerdefaultURL, params, new AsyncHttpResponseHandler() {
  1260 + @Override
  1261 + public void onSuccess(int i, Header[] headers, byte[] bytes) {
  1262 + Log.e("test", "onSuccess" + new String(bytes));
  1263 + try {
  1264 + JSONObject jsonObject = new JSONObject(new String(bytes));
  1265 + String status = jsonObject.optString("status");
  1266 + JSONObject jsonObject1 = jsonObject.getJSONObject("data");
  1267 + String imagUrl = jsonObject1.optString("imgUrl");
  1268 + SaveParam.getInstance().saveLoginParam(mContext, SaveParam.HEADURL, imagUrl);
  1269 + if (status.equals("1")) {
  1270 + Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show();
  1271 + } else {
  1272 + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
1218 1273 }
  1274 + } catch (JSONException e) {
  1275 + e.printStackTrace();
1219 1276 }
  1277 + }
1220 1278  
1221   - @Override
1222   - public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
1223   - closeProgress();
1224   - Log.e("test", "错误信息" + new String(bytes));
1225   - AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
  1279 + @Override
  1280 + public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
  1281 + closeProgress();
  1282 + Log.e("test", "错误信息" + new String(bytes));
  1283 + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
1226 1284  
1227   - }
1228   - });
  1285 + }
  1286 + });
1229 1287 }
1230 1288  
1231 1289 /**
1232 1290 * 检查注册信息是否完整
  1291 + *
1233 1292 * @param mContext
1234 1293 * @param userId
1235 1294 */
... ... @@ -1238,7 +1297,7 @@ public class HttpManager {
1238 1297 false, true, null);
1239 1298 HttpClient.getInstance().setTimeout(5 * 1000);
1240 1299 HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
1241   - HttpClient.getInstance().get(HttpUrl.isRegisterInfoCompleteURL + "?userId=" + userId , new AsyncHttpResponseHandler() {
  1300 + HttpClient.getInstance().get(HttpUrl.isRegisterInfoCompleteURL + "?userId=" + userId, new AsyncHttpResponseHandler() {
1242 1301 @Override
1243 1302 public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
1244 1303 closeProgress();
... ... @@ -1253,15 +1312,17 @@ public class HttpManager {
1253 1312 @Override
1254 1313 public void onFailure(int arg0, Header[] arg1, byte[] arg2, Throwable arg3) {
1255 1314 closeProgress();
1256   - // Log.e("test", "错误信息" + new String(arg2));
  1315 + // Log.e("test", "错误信息" + new String(arg2));
1257 1316 AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!");
1258 1317  
1259 1318 }
1260 1319 });
1261 1320  
1262 1321 }
  1322 +
1263 1323 /**
1264 1324 * 获取最近学习视频
  1325 + *
1265 1326 * @param mContext
1266 1327 * @param userId
1267 1328 */
... ... @@ -1270,7 +1331,7 @@ public class HttpManager {
1270 1331 false, true, null);
1271 1332 HttpClient.getInstance().setTimeout(5 * 1000);
1272 1333 HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
1273   - HttpClient.getInstance().get(HttpUrl.getvidioURL + "?userId=" + userId , new AsyncHttpResponseHandler() {
  1334 + HttpClient.getInstance().get(HttpUrl.getvidioURL + "?userId=" + userId, new AsyncHttpResponseHandler() {
1274 1335 @Override
1275 1336 public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
1276 1337 closeProgress();
... ... @@ -1286,7 +1347,7 @@ public class HttpManager {
1286 1347 msg.obj = schoolInfoBeanList;
1287 1348 handler.sendMessage(msg);
1288 1349  
1289   - }else {
  1350 + } else {
1290 1351 AlertUtils.showToast(mContext, "你好，服务器异常，请稍后再试!");
1291 1352  
1292 1353 }
... ... @@ -1342,10 +1403,11 @@ public class HttpManager {
1342 1403 });
1343 1404  
1344 1405 }
  1406 +
1345 1407 //版本信息
1346   - public void versioninfo(final Context mContext,String subjectName, final Handler handler) {
  1408 + public void versioninfo(final Context mContext, String subjectName, final Handler handler) {
1347 1409 HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
1348   - HttpClient.getInstance().get(HttpUrl.getversionURL+"?subjectName="+subjectName, new AsyncHttpResponseHandler() {
  1410 + HttpClient.getInstance().get(HttpUrl.getversionURL + "?subjectName=" + subjectName, new AsyncHttpResponseHandler() {
1349 1411 @Override
1350 1412 public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
1351 1413 Log.e("test", "版本信息" + new String(arg2));
... ... @@ -1360,10 +1422,10 @@ public class HttpManager {
1360 1422 message.obj = versionInfoList;
1361 1423 handler.sendMessage(message);
1362 1424  
1363   - } else if(status == 1000){
  1425 + } else if (status == 1000) {
1364 1426 AlertUtils.showToast(mContext, "你好，该科目没有版本信息");
1365 1427  
1366   - }else {
  1428 + } else {
1367 1429 AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!");
1368 1430 }
1369 1431 } catch (JSONException e) {
... ... @@ -1381,10 +1443,6 @@ public class HttpManager {
1381 1443 }
1382 1444  
1383 1445  
1384   -
1385   -
1386   -
1387   -
1388 1446 ///省级接口
1389 1447 public void provices(final Context mContext, final Handler handler) {
1390 1448 HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
... ... @@ -1422,10 +1480,11 @@ public class HttpManager {
1422 1480 }
1423 1481 });
1424 1482 }
  1483 +
1425 1484 //获取版本信息接口
1426   - public void getpublishinfo(final Context mContext, Object userId,int gradeId, int type,final Handler handler) {
  1485 + public void getpublishinfo(final Context mContext, Object userId, int gradeId, int type, final Handler handler) {
1427 1486 HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
1428   - HttpClient.getInstance().get(HttpUrl.getpublishURL + "?userId=" + userId+ "&gradeId=" + gradeId+ "&type=" + type, new AsyncHttpResponseHandler() {
  1487 + HttpClient.getInstance().get(HttpUrl.getpublishURL + "?userId=" + userId + "&gradeId=" + gradeId + "&type=" + type, new AsyncHttpResponseHandler() {
1429 1488 @Override
1430 1489 public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
1431 1490 Log.e("test", "获取版本信息接口" + new String(arg2));
... ... @@ -1544,10 +1603,9 @@ public class HttpManager {
1544 1603 e.printStackTrace();
1545 1604 }
1546 1605 }
1547   - public boolean onKeyDown(int keyCode, KeyEvent event)
1548   - {
1549   - if (keyCode == KeyEvent.KEYCODE_BACK )
1550   - {
  1606 +
  1607 + public boolean onKeyDown(int keyCode, KeyEvent event) {
  1608 + if (keyCode == KeyEvent.KEYCODE_BACK) {
1551 1609  
1552 1610 HttpManager.getInstance().closeProgress();
1553 1611 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java
Diff comments   View file @522aba5
... ... @@ -44,6 +44,7 @@ public class HttpUrl {
44 44 public static String getvidioURL=GetDomain()+"/personal/video/recent";//获取最近学习视频
45 45 public static String submitregisterURL=GetDomain()+"/register/extrainfo/submit";//提交注册信息
46 46 public static String chagepublishURL=GetDomain()+"/userPress/update";//修改版本信息
  47 + public static String chageaccountphoneURL=GetDomain()+"/electronicCard/updateUserNameByUserId";//修改账户绑定
47 48  
48 49  
49 50  
... ...
PersonalCenter/app/src/main/res/layout/activity_account_management.xml
Diff comments   View file @522aba5
... ... @@ -182,8 +182,9 @@
182 182  
183 183 <LinearLayout
184 184 android:id="@+id/ll_zhu_backgrangd"
185   - android:layout_width="wrap_content"
  185 + android:layout_width="400dp"
186 186 android:layout_height="wrap_content"
  187 + android:layout_marginLeft="5dp"
187 188 android:background="@drawable/corcle_blue_bg"
188 189 android:orientation="vertical">
189 190  
... ...
PersonalCenter/app/src/main/res/layout/activity_main.xml
Diff comments   View file @522aba5
... ... @@ -127,8 +127,16 @@
127 127 android:id="@+id/tv_username"
128 128 android:layout_width="wrap_content"
129 129 android:layout_height="wrap_content"
130   - android:text="姓名"
  130 + android:text=""
131 131 android:textSize="20dp" />
  132 + <TextView
  133 + android:id="@+id/tv_yangji"
  134 + android:layout_marginLeft="5dp"
  135 + android:layout_width="wrap_content"
  136 + android:layout_height="wrap_content"
  137 + android:text="（样机）"
  138 + android:textSize="20dp"
  139 + android:visibility="gone"/>
132 140  
133 141 <ImageView
134 142 android:id="@+id/iv_sex"
... ... @@ -153,7 +161,9 @@
153 161 android:layout_width="0dp"
154 162 android:layout_height="wrap_content"
155 163 android:layout_weight="5"
156   - android:text="请输入个性签名"
  164 + android:hint="请输入个性签名"
  165 + android:maxLines="3"
  166 + android:ellipsize="end"
157 167 android:textSize="18sp" />
158 168  
159 169 <ImageView
... ...
PersonalCenter/circledialog/src/main/java/com/mylhyl/circledialog/res/values/CircleColor.java
Diff comments   View file @522aba5
... ... @@ -21,17 +21,17 @@ public class CircleColor {
21 21 /**
22 22 * 按钮颜色
23 23 */
24   - public static final int button = 0xFF007AFF;
  24 + public static final int button = 0xFF8F8F8F;
25 25 /**
26 26 * 线条颜色
27 27 */
28   - public static final int divider = 0xFFD7D7DB;
  28 + public static final int divider = 0x808080;
29 29 /**
30 30 * 按钮点击颜色
31 31 */
32   - public static final int buttonPress = 0xFFEAEAEA;
  32 + public static final int buttonPress = 0xFF8F8F8F;
33 33 /**
34 34 * 输入框边框颜色
35 35 */
36   - public static final int inputStroke = 0xFF808080;
  36 + public static final int inputStroke = 0xFFFFFF;
37 37 }
... ...
PersonalCenter/circledialog/src/main/java/com/mylhyl/circledialog/res/values/CircleDimen.java
Diff comments   View file @522aba5
... ... @@ -11,15 +11,15 @@ public class CircleDimen {
11 11 /**
12 12 * 标题高
13 13 */
14   - public static final int TITLE_HEIGHT = 170;
  14 + public static final int TITLE_HEIGHT = 150;
15 15 /**
16 16 * 标题字体大小
17 17 */
18   - public static final int TITLE_TEXT_SIZE = 60;
  18 + public static final int TITLE_TEXT_SIZE = 44;
19 19 /**
20 20 * 文字消息字体大小
21 21 */
22   - public static final int CONTENT_TEXT_SIZE = 50;
  22 + public static final int CONTENT_TEXT_SIZE = 30;
23 23  
24 24 /**
25 25 * 列表每行高度
... ... @@ -28,11 +28,11 @@ public class CircleDimen {
28 28 /**
29 29 * 底部按钮高度
30 30 */
31   - public static final int FOOTER_HEIGHT = 150;
  31 + public static final int FOOTER_HEIGHT = 100;
32 32 /**
33 33 * 底部按钮字体大小
34 34 */
35   - public static final int FOOTER_TEXT_SIZE = 40;
  35 + public static final int FOOTER_TEXT_SIZE = 35;
36 36  
37 37 /**
38 38 * 列表模式底部按钮与列表的距离
... ... @@ -42,7 +42,7 @@ public class CircleDimen {
42 42 /**
43 43 * 输入框的高
44 44 */
45   - public static final int INPUT_HEIGHT = 340;
  45 + public static final int INPUT_HEIGHT = 300;
46 46 /**
47 47 * 水平进度条高度
48 48 */
... ...