hjx-app / PresonalCenter

Download as
Browse Code »

Commit 68ca27b89a3a99540c8f1810a41cbb8484caa9d7

Authored by xiongwei
1 parent 94850fa261
Exists in master

解决保卡问题 完善个人中心

Showing 15 changed files with 44 additions and 57 deletions   Show diff stats
PersonalCenter/.idea/misc.xml
Diff comments   View file @68ca27b
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3   - <component name="EntryPointsManager">
4   - <entry_points version="2.0" />
5   - </component>
6 3 <component name="NullableNotNullManager">
7 4 <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
8 5 <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
... ... @@ -27,17 +24,7 @@
27 24 </value>
28 25 </option>
29 26 </component>
30   - <component name="ProjectLevelVcsManager" settingsEditedManually="false">
31   - <OptionsSetting value="true" id="Add" />
32   - <OptionsSetting value="true" id="Remove" />
33   - <OptionsSetting value="true" id="Checkout" />
34   - <OptionsSetting value="true" id="Update" />
35   - <OptionsSetting value="true" id="Status" />
36   - <OptionsSetting value="true" id="Edit" />
37   - <ConfirmationsSetting value="0" id="Add" />
38   - <ConfirmationsSetting value="0" id="Remove" />
39   - </component>
40   - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
  27 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
41 28 <output url="file://$PROJECT_DIR$/build/classes" />
42 29 </component>
43 30 <component name="ProjectType">
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @68ca27b
... ... @@ -76,6 +76,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
76 76 private TextView linel_mycuoti, linel_mynote, linel_mycollege, linel_myclass, iv_look_card;
77 77 private TopRightMenu mTopRightMenu;
78 78 private LinearLayout view_novedeo;
  79 + private View sssssssss;
79 80 //水平滑动
80 81 private RecyclerView mRecyclerView;
81 82 private GridView mRecyclerViewpublish;
... ... @@ -211,20 +212,22 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
211 212 jsonObject = new JSONObject((String) msg.obj);
212 213 status = jsonObject.getString("status");
213 214 if (status.equals("1")) {
214   - tv_yangji.setVisibility(View.GONE);
  215 + sssssssss.setVisibility(View.VISIBLE);
  216 + tv_yangji.setVisibility(View.INVISIBLE);
215 217 iv_look_card.setVisibility(View.VISIBLE);
  218 + //客机没有保卡
216 219 } else if (status.equals("2001")) {
217   - tv_yangji.setVisibility(View.GONE);
  220 + sssssssss.setVisibility(View.VISIBLE);
  221 + tv_yangji.setVisibility(View.INVISIBLE);
218 222 iv_look_card.setVisibility(View.VISIBLE);
219 223 AlertUtils.showToast(MainActivity.this, "您的机器还没有保卡信息或该机器已置为样机，请重新登录");
220   - SaveParam.getInstance().clearData(MainActivity.this);
221 224 Intent settingintent = new Intent();
222 225 settingintent.setClass(MainActivity.this, LoginAndRegisterActivity.class);
223 226 startActivity(settingintent);
224 227 overridePendingTransition(R.anim.rightin, R.anim.rightout);
225   - finish();
226   - } else if (status.equals("2002")) {
227   - iv_look_card.setVisibility(View.GONE);
  228 + } else if (status.equals("2002")) {//样机
  229 + sssssssss.setVisibility(View.INVISIBLE);
  230 + iv_look_card.setVisibility(View.INVISIBLE);
228 231 tv_yangji.setVisibility(View.VISIBLE);
229 232  
230 233 } else {
... ... @@ -290,6 +293,8 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
290 293 mRecyclerViewpublish = (GridView) findViewById(R.id.id_recyclerview_pubish);
291 294 view_novedeo = (LinearLayout) findViewById(R.id.view_novedeo);
292 295  
  296 + sssssssss = findViewById(R.id.sssssssss);
  297 +
293 298 }
294 299  
295 300  
... ... @@ -325,10 +330,13 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
325 330 //判断保卡信息是否为样机
326 331 String yangji = SaveParam.getInstance().getLoginParam(this, SaveParam.YANGJI);
327 332 String deviceNumber = GetDevicesUtil.getDevicesInfo(MainActivity.this).getDeviceNumber();
  333 + Log.d("test","yangji"+yangji);
328 334 if ("1".equals(yangji)) {
329   - iv_look_card.setVisibility(View.GONE);
  335 + sssssssss.setVisibility(View.INVISIBLE);
  336 + iv_look_card.setVisibility(View.INVISIBLE);
330 337 tv_yangji.setVisibility(View.VISIBLE);
331 338 } else {
  339 + SaveParam.getInstance().saveLoginParam(MainActivity.this, SaveParam.YANGJI, "0");
332 340 HttpManager.getInstance().getcardinfo1(this, deviceNumber, handler);
333 341  
334 342 }
... ... @@ -400,8 +408,8 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
400 408 .setPositive("确定", new View.OnClickListener() {
401 409 @Override
402 410 public void onClick(View v) {
403   - String graderID = SaveParam.getInstance().getLoginParam(MainActivity.this, SaveParam.GRADENS);
404   - int graderIDs = Integer.parseInt(graderID);
  411 + //String graderID = SaveParam.getInstance().getLoginParam(MainActivity.this, SaveParam.GRADENS);
  412 + //int graderIDs = Integer.parseInt(graderID);
405 413 // if (graderIDs < 8) {
406 414 // Intent intentbroad = new Intent();
407 415 // intentbroad.putExtra("info", "小学");
... ... @@ -440,7 +448,8 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
440 448 .setCancelable(true)
441 449 .setTitle("个性签名")
442 450 .setInputHint("请输入个性签名")
443   - .setWidth(0.5f)
  451 + .setWidth(0.4f)
  452 + .setInputHeight(80)
444 453 .configInput(new ConfigInput() {
445 454 @Override
446 455 public void onConfig(InputParams params) {
... ... @@ -485,28 +494,16 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
485 494 .show();
486 495 break;
487 496 case R.id.linel_mycuoti:
488   -// Intent intentbroad = new Intent();
489   -// //intentbroad.putExtra("info","小学");
490   -// //4、定义广播发送的action
491   -// intentbroad.setAction("com.ozing.launcher.SWITCH_GRADE");
492   -// //5、发送广播
493   -// sendBroadcast(intentbroad);
494   -// Log.i("---", "发送完了");
  497 + AlertUtils.showToast(this, "未安装该应用 ");
495 498 break;
496 499 case R.id.linel_mynote:
497   -// Intent intentbroad1 = new Intent();
498   -// //intentbroad1.putExtra("info","中学");
499   -// //4、定义广播发送的action
500   -// intentbroad1.setAction("com.ozing.launcher.SWITCH_GRADE");
501   -// //5、发送广播
502   -// sendBroadcast(intentbroad1);
503   -// Log.i("---", "发送完了");
  500 + AlertUtils.showToast(this, "未安装该应用 ");
504 501 break;
505 502 case R.id.linel_mycollege:
506   - AlertUtils.showToast(this, "我的收藏 ");
  503 + AlertUtils.showToast(this, "未安装该应用 ");
507 504 break;
508 505 case R.id.linel_myclass:
509   - AlertUtils.showToast(this, "我的班级 ");
  506 + AlertUtils.showToast(this, "未安装该应用 ");
510 507 break;
511 508 }
512 509  
... ... @@ -566,7 +563,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
566 563 if (headpitiaon == 1) {
567 564 mSimpleDraweeView.setImageDrawable(null);
568 565 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar1);
569   - picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/61e8d8cf-651f-49c9-beb2-ff1387af390a.png";
  566 + picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2018-01-25/75f05c02-3dbc-44e3-aec9-a73eca60ca8b.png";
570 567 try {
571 568 HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
572 569 } catch (UnsupportedEncodingException e) {
... ... @@ -575,7 +572,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
575 572 } else if (headpitiaon == 2) {
576 573 mSimpleDraweeView.setImageDrawable(null);
577 574 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar2);
578   - picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/8480ff7b-42f1-4d64-b848-c8f4f3afd385.png";
  575 + picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2018-01-25/d102b0d8-435f-45a5-908f-ea43e02176d4.png";
579 576 try {
580 577 HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
581 578 } catch (UnsupportedEncodingException e) {
... ... @@ -584,7 +581,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
584 581 } else if (headpitiaon == 3) {
585 582 mSimpleDraweeView.setImageDrawable(null);
586 583 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar3);
587   - picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/184112f4-bfe0-4db8-bc1e-6212755b241c.png";
  584 + picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2018-01-25/a623a8ba-5e56-4827-95d1-ffeb0d6874d5.png";
588 585 try {
589 586 HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
590 587 } catch (UnsupportedEncodingException e) {
... ... @@ -593,7 +590,7 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
593 590 } else if (headpitiaon == 4) {
594 591 mSimpleDraweeView.setImageDrawable(null);
595 592 mSimpleDraweeView.setImageResource(R.mipmap.default_avatar4);
596   - picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2017-08-29/e31c9e11-9276-4bf4-a162-b66272fdc351.png";
  593 + picUrl = "http://hjxprodbucket.oss.aliyuncs.com/static/upload/boss_api/announcement/2018-01-25/3d822736-a18d-47ae-b0b1-67752e027375.png";
597 594 try {
598 595 HttpManager.getInstance().headerdeft(this, userID, typeaccount, picUrl);
599 596 } catch (UnsupportedEncodingException e) {
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java
Diff comments   View file @68ca27b
... ... @@ -149,6 +149,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
149 149 getActivity().startActivity(intent);
150 150 getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
151 151 } else if (status.equals("2001")) {
  152 + SaveParam.getInstance().saveCustomizeParam(getActivity(),SaveParam.CARDPHONE,"");
152 153 ElectronicCardDialog.getInstance().show(getChildFragmentManager(), "ElectronicCardDialog");
153 154 } else {
154 155 Toast.makeText(getActivity(), "请检查网络", Toast.LENGTH_LONG).show();
... ... @@ -170,8 +171,6 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
170 171 initView(mView);
171 172 initData();
172 173 setLister();
173   -
174   -
175 174 }
176 175 return mView;
177 176 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/UserInfoModer.java
Diff comments   View file @68ca27b
... ... @@ -14,6 +14,9 @@ public class UserInfoModer implements Serializable {
14 14 private String school;
15 15 private String grade;
16 16 private String gradeid;
  17 + private String birthday;
  18 + private String qq;
  19 + private String isprototype;
17 20  
18 21 public String getIsprototype() {
19 22 return isprototype;
... ... @@ -22,20 +25,13 @@ public class UserInfoModer implements Serializable {
22 25 public void setIsprototype(String isprototype) {
23 26 this.isprototype = isprototype;
24 27 }
25   -
26   - private String isprototype;
27   -
28 28 public String getGradeid() {
29 29 return gradeid;
30 30 }
31   -
32 31 public void setGradeid(String gradeid) {
33 32 this.gradeid = gradeid;
34 33 }
35 34  
36   - private String birthday;
37   - private String qq;
38   -
39 35 public String getNickName() {
40 36 return nickName;
41 37 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java
Diff comments   View file @68ca27b
... ... @@ -94,8 +94,15 @@ public class CenterService extends BaseService {
94 94 dataBean.setAlterSaleCall(SaveParam.getInstance().getCustomizeParam(getApplication(),SaveParam.SHOPTLEPHONE));
95 95 dataBean.setMobilePhone(SaveParam.getInstance().getCustomizeParam(getApplication(),SaveParam.CARDPHONE));
96 96 // cardInfo.setData(dataBean);
97   - results =gson.toJson(dataBean);
  97 +
98 98 //Log.e("test","保卡信息"+results);
  99 + String yangji = SaveParam.getInstance().getLoginParam(getApplication(), SaveParam.YANGJI);
  100 + if ("1".equals(yangji)) {
  101 + results = null;
  102 + } else {
  103 + results = gson.toJson(dataBean);
  104 + }
  105 +
99 106 return results;
100 107  
101 108 }
... ... @@ -114,7 +121,7 @@ public class CenterService extends BaseService {
114 121 userInfoModer.setAddress(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTXINGZUO));
115 122 userInfoModer.setPortrait(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.PORTAIT));
116 123 userInfoModer.setGradeid(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.GRADENS));
117   - userInfoModer.setIsprototype(SaveParam.getInstance().getCustomizeParam(getApplication(),SaveParam.ISYANGJI));
  124 + userInfoModer.setIsprototype(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.YANGJI));
118 125 userinfo = gson.toJson(userInfoModer);
119 126 return userinfo;
120 127 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/AlertUtils.java
Diff comments   View file @68ca27b
... ... @@ -6,6 +6,6 @@ import android.widget.Toast;
6 6  
7 7 public class AlertUtils {
8 8 public static void showToast(Context context, String msg) {
9   - Toast.makeText(context, msg, Toast.LENGTH_LONG).show();
  9 + Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
10 10 }
11 11 }
... ...
PersonalCenter/app/src/main/res/layout/activity_main.xml
Diff comments   View file @68ca27b
... ... @@ -288,7 +288,7 @@
288 288 android:layout_width="0dp"
289 289 android:layout_height="wrap_content"
290 290 android:layout_weight="1"
291   - android:text="我的班级"
  291 + android:text="我的生词"
292 292 android:paddingTop="20dp"
293 293 android:paddingBottom="20dp"
294 294 android:textSize="20sp" />
... ... @@ -315,6 +315,7 @@
315 315 android:textColor="@color/login_text_blue"
316 316 android:text="好记星电子产品保修卡" />
317 317 <View
  318 + android:id="@+id/sssssssss"
318 319 android:layout_width="135dp"
319 320 android:layout_marginTop="2dp"
320 321 android:layout_gravity="center"
... ...
PersonalCenter/app/src/main/res/mipmap-hdpi/default_avatar1.png
Diff comments   View file @68ca27b

18 KB
PersonalCenter/app/src/main/res/mipmap-hdpi/default_avatar2.png
Diff comments   View file @68ca27b

26.6 KB
PersonalCenter/app/src/main/res/mipmap-hdpi/default_avatar3.png
Diff comments   View file @68ca27b

24.9 KB
PersonalCenter/app/src/main/res/mipmap-hdpi/default_avatar4.png
Diff comments   View file @68ca27b

17.9 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/default_avatar1.png
View file @94850fa

30.4 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/default_avatar2.png
View file @94850fa

34.5 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/default_avatar3.png
View file @94850fa

39.5 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/default_avatar4.png
View file @94850fa

38.3 KB