hjx-app / PresonalCenter

Download as
Browse Code »

Commit a1f628ad780aa2946606dac9943d0e3fab2ebf24

Authored by xiongwei
1 parent a145cbca13
Exists in master

完成界面

Showing 50 changed files with 1901 additions and 241 deletions   Show diff stats
PersonalCenter/.idea/modules.xml
Diff comments   View file @a1f628a
... ... @@ -6,7 +6,6 @@
6 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
7 7 <module fileurl="file://$PROJECT_DIR$/circledialog/circledialog.iml" filepath="$PROJECT_DIR$/circledialog/circledialog.iml" />
8 8 <module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
9   - <module fileurl="file://$PROJECT_DIR$/pickerview/pickerview.iml" filepath="$PROJECT_DIR$/pickerview/pickerview.iml" />
10 9 </modules>
11 10 </component>
12 11 </project>
13 12 \ No newline at end of file
... ...
PersonalCenter/app/src/main/AndroidManifest.xml
Diff comments   View file @a1f628a
... ... @@ -102,6 +102,18 @@
102 102 android:screenOrientation="landscape">
103 103  
104 104 </activity>
  105 + <activity
  106 + android:name=".activity.AccountManagementActivity"
  107 + android:launchMode="singleTask"
  108 + android:screenOrientation="landscape">
  109 +
  110 + </activity>
  111 + <activity
  112 + android:name=".activity.ChangePresonalInfoActivity"
  113 + android:launchMode="singleTask"
  114 + android:screenOrientation="landscape">
  115 +
  116 + </activity>
105 117 </application>
106 118  
107 119 </manifest>
108 120 \ No newline at end of file
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,18 @@
  1 +package com.hjx.personalcenter.activity;
  2 +
  3 +import android.app.Activity;
  4 +import android.os.Bundle;
  5 +
  6 +import com.hjx.personalcenter.R;
  7 +
  8 +/**账户管理 熊巍
  9 + * Created by h on 2017/8/12.
  10 + */
  11 +
  12 +public class AccountManagementActivity extends Activity {
  13 + @Override
  14 + protected void onCreate(Bundle savedInstanceState) {
  15 + super.onCreate(savedInstanceState);
  16 + setContentView(R.layout.activity_account_management);
  17 + }
  18 +}
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java
Diff comments   View file @a1f628a
... ... @@ -13,6 +13,6 @@ public class ChangeElectronicCardInfoActivity extends Activity{
13 13 @Override
14 14 protected void onCreate(Bundle savedInstanceState) {
15 15 super.onCreate(savedInstanceState);
16   - setContentView(R.layout.activity_change_card_info);
  16 + setContentView(R.layout.activity_change_card_validation);
17 17 }
18 18 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,68 @@
  1 +package com.hjx.personalcenter.activity;
  2 +
  3 +import android.os.Bundle;
  4 +import android.support.v4.app.Fragment;
  5 +import android.support.v4.view.ViewPager;
  6 +import android.support.v7.app.AppCompatActivity;
  7 +
  8 +import com.hjx.personalcenter.R;
  9 +import com.hjx.personalcenter.adapter.LoginAndRegisterAdapter;
  10 +import com.hjx.personalcenter.fragment.PresonInfoFragment;
  11 +import com.hjx.personalcenter.fragment.VersionsInfoFragment;
  12 +import com.hjx.personalcenter.thirdparty.SlidingTabLayout;
  13 +
  14 +import java.util.ArrayList;
  15 +import java.util.Arrays;
  16 +import java.util.List;
  17 +
  18 +/**
  19 + * Created by h on 2017/8/12.
  20 + */
  21 +
  22 +public class ChangePresonalInfoActivity extends AppCompatActivity {
  23 + private ViewPager viewPager;
  24 + private SlidingTabLayout tableLayout;
  25 + private List<Fragment> presoninfo;
  26 + private LoginAndRegisterAdapter presoninfodapter;
  27 + private List<String> title = Arrays.asList("个人信息", "版本信息");
  28 + @Override
  29 + protected void onCreate(Bundle savedInstanceState) {
  30 + super.onCreate(savedInstanceState);
  31 + setContentView(R.layout.activity_change_preson_info);
  32 + initView();
  33 + initData();
  34 + setLister();
  35 +
  36 + }
  37 + private void initView() {
  38 + viewPager = (ViewPager) findViewById(R.id.viewpager_login);
  39 + tableLayout = (SlidingTabLayout) findViewById(R.id.TabLayout_id);
  40 + }
  41 +
  42 + private void initData() {
  43 + presoninfo = new ArrayList<>();
  44 + for (int i = 0; i < title.size(); i++) {
  45 + if (title.get(i).equals("个人信息")) {
  46 + presoninfo.add(PresonInfoFragment.newInstance(i + 1));
  47 + } else {
  48 + presoninfo.add(VersionsInfoFragment.newInstance(i + 1));
  49 + }
  50 + }
  51 +
  52 +
  53 + //设置Tab上的标题
  54 + tableLayout.setData(title);
  55 + //设置关联的ViewPager
  56 + tableLayout.setViewPager(viewPager, 0);
  57 + presoninfodapter = new LoginAndRegisterAdapter(presoninfo, getSupportFragmentManager());
  58 + //给ViewPager设置适配器
  59 + viewPager.setAdapter(presoninfodapter);
  60 + //设置滑动时数据不丢失
  61 + viewPager.setOffscreenPageLimit(1);
  62 + //将TabLayout和ViewPager关联起来。
  63 + }
  64 +
  65 + private void setLister() {
  66 + }
  67 +
  68 +}
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
Diff comments   View file @a1f628a
1 1 package com.hjx.personalcenter.activity;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Intent;
4 5 import android.graphics.Color;
5 6 import android.os.Bundle;
6   -import android.view.Gravity;
7 7 import android.view.View;
8   -import android.view.ViewGroup;
9 8 import android.widget.Button;
10 9 import android.widget.LinearLayout;
11 10 import android.widget.TextView;
... ... @@ -25,6 +24,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
25 24 private LinearLayout lineL_buy_time;
26 25 private TextView tv_buy_time;
27 26 private TimePickerView pvTime;
  27 + private Button btn_change_info;
28 28  
29 29 @Override
30 30 protected void onCreate(Bundle savedInstanceState) {
... ... @@ -39,6 +39,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
39 39 private void initView() {
40 40 lineL_buy_time = (LinearLayout) findViewById(R.id.lineL_buy_time);
41 41 tv_buy_time = (TextView) findViewById(R.id.tv_buy_time);
  42 + btn_change_info = (Button) findViewById(R.id.btn_change_info);
42 43 }
43 44  
44 45 private void initData() {
... ... @@ -47,6 +48,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
47 48  
48 49 private void initLister() {
49 50 lineL_buy_time.setOnClickListener(this);
  51 + btn_change_info.setOnClickListener(this);
50 52  
51 53 }
52 54 private void initTimePicker() {
... ... @@ -77,6 +79,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
77 79 .setRangDate(startDate, endDate)
78 80 .setBackgroundId(0x80000000) //设置外部遮罩颜色
79 81 .setDecorView(null)
  82 + .setTitleText("购买日期")
  83 + .setTitleSize(22)
  84 + .setCancelColor(Color.GRAY)
  85 + .setSubCalSize(22)
  86 + .setDividerColor(Color.GRAY)
  87 + .setSubmitColor(Color.GRAY)
80 88 .build();
81 89 }
82 90 private String getTime(Date date) {//可根据需要自行截取数据显示
... ... @@ -90,6 +98,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
90 98 case R.id.lineL_buy_time:
91 99 pvTime.show(tv_buy_time);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view
92 100 break;
  101 + case R.id.btn_change_info:
  102 + Intent intent = new Intent();
  103 + intent.setClass(ElectronicCardEditInfoActivity.this,ElectronicCardInfoOKActivity.class);
  104 + startActivity(intent);
  105 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  106 + break;
93 107 }
94 108  
95 109  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java
Diff comments   View file @a1f628a
1 1 package com.hjx.personalcenter.activity;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Intent;
4 5 import android.os.Bundle;
  6 +import android.view.View;
  7 +import android.widget.Button;
5 8  
6 9 import com.hjx.personalcenter.R;
7 10  
8   -/**
  11 +/**确认保卡信息
9 12 * Created by h on 2017/8/11.
10 13 */
11 14  
12   -public class ElectronicCardInfoOKActivity extends Activity{
  15 +public class ElectronicCardInfoOKActivity extends Activity implements View.OnClickListener {
  16 + private Button btn_finish;
13 17 @Override
14 18 protected void onCreate(Bundle savedInstanceState) {
15 19 super.onCreate(savedInstanceState);
16 20 setContentView(R.layout.activity_ok_cardinfo);
  21 + initView();
  22 + initData();
  23 + initLister();
  24 + }
  25 + private void initView() {
  26 + btn_finish = (Button) findViewById(R.id.btn_finish);
  27 + }
  28 +
  29 + private void initData() {
  30 +
  31 + }
  32 +
  33 + private void initLister() {
  34 + btn_finish.setOnClickListener(this);
  35 + }
  36 +
  37 + @Override
  38 + public void onClick(View v) {
  39 + switch (v.getId()){
  40 + case R.id.btn_finish:
  41 + Intent intent = new Intent();
  42 + intent.setClass(ElectronicCardInfoOKActivity.this,TheStartPageActivity.class);
  43 + startActivity(intent);
  44 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  45 + break;
  46 + }
17 47 }
18 48 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
Diff comments   View file @a1f628a
1 1 package com.hjx.personalcenter.activity;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Intent;
4 5 import android.os.Bundle;
  6 +import android.view.View;
  7 +import android.widget.Button;
5 8  
6 9 import com.hjx.personalcenter.R;
7 10  
... ... @@ -9,10 +12,39 @@ import com.hjx.personalcenter.R;
9 12 * Created by h on 2017/8/9.
10 13 */
11 14  
12   -public class ElectronicCardValidationActivity extends Activity {
  15 +public class ElectronicCardValidationActivity extends Activity implements View.OnClickListener {
  16 + private Button btn_card_valiyanzhen;
13 17 @Override
14 18 protected void onCreate(Bundle savedInstanceState) {
15 19 super.onCreate(savedInstanceState);
16 20 setContentView(R.layout.activity_electroniccard_validation);
  21 + initView();
  22 + initData();
  23 + initLister();
  24 + }
  25 +
  26 + private void initView() {
  27 + btn_card_valiyanzhen = (Button) findViewById(R.id.btn_card_valiyanzhen);
  28 + }
  29 +
  30 + private void initData() {
  31 +
  32 + }
  33 +
  34 + private void initLister() {
  35 + btn_card_valiyanzhen.setOnClickListener(this);
  36 +
  37 + }
  38 +
  39 + @Override
  40 + public void onClick(View v) {
  41 + switch (v.getId()){
  42 + case R.id.btn_card_valiyanzhen:
  43 + Intent intent = new Intent();
  44 + intent.setClass(ElectronicCardValidationActivity.this,ElectronicCardEditInfoActivity.class);
  45 + startActivity(intent);
  46 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  47 + break;
  48 + }
17 49 }
18 50 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @a1f628a
1 1 package com.hjx.personalcenter.activity;
2 2  
3 3 import android.content.Intent;
4   -import android.support.v7.app.AppCompatActivity;
5 4 import android.os.Bundle;
  5 +import android.support.v7.app.AppCompatActivity;
6 6 import android.view.View;
7   -import android.widget.TextView;
  7 +import android.widget.ImageView;
8 8  
9 9 import com.hjx.personalcenter.R;
10 10  
11   -public class MainActivity extends AppCompatActivity {
12   - TextView ssss;
  11 +public class MainActivity extends AppCompatActivity implements View.OnClickListener {
  12 + ImageView iv_imformatioan;
13 13 @Override
14 14 protected void onCreate(Bundle savedInstanceState) {
15 15 super.onCreate(savedInstanceState);
16 16 setContentView(R.layout.activity_main);
17   - ssss = (TextView) findViewById(R.id.ssss);
18   - ssss.setOnClickListener(new View.OnClickListener() {
19   - @Override
20   - public void onClick(View v) {
21   - Intent intent = new Intent(MainActivity.this,ElectronicCardEditInfoActivity.class);
  17 + initView();
  18 + initData();
  19 + initLister();
  20 + }
  21 +
  22 + private void initView() {
  23 + iv_imformatioan = (ImageView) findViewById(R.id.iv_imformatioan);
  24 + }
  25 +
  26 + private void initData() {
  27 +
  28 + }
  29 +
  30 + private void initLister() {
  31 + iv_imformatioan.setOnClickListener(this);
  32 + }
  33 +
  34 + @Override
  35 + public void onClick(View v) {
  36 + switch (v.getId()){
  37 + case R.id.iv_imformatioan:
  38 + Intent intent = new Intent();
  39 + intent.setClass(MainActivity.this,LoginAndRegisterActivity.class);
22 40 startActivity(intent);
23   - }
24   - });
  41 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  42 + break;
  43 + }
  44 +
25 45 }
26 46 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java
Diff comments   View file @a1f628a
1 1 package com.hjx.personalcenter.activity;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Intent;
4 5 import android.os.Bundle;
  6 +import android.view.View;
  7 +import android.widget.Button;
5 8  
6 9 import com.hjx.personalcenter.R;
7 10  
... ... @@ -9,10 +12,37 @@ import com.hjx.personalcenter.R;
9 12 * Created by h on 2017/8/10.
10 13 */
11 14  
12   -public class TheStartPageActivity extends Activity{
  15 +public class TheStartPageActivity extends Activity implements View.OnClickListener {
  16 + private Button btn_start;
13 17 @Override
14 18 protected void onCreate(Bundle savedInstanceState) {
15 19 super.onCreate(savedInstanceState);
16 20 setContentView(R.layout.activity_start_page);
  21 + initView();
  22 + initData();
  23 + initLister();
  24 + }
  25 + private void initView() {
  26 + btn_start = (Button) findViewById(R.id.btn_start);
  27 + }
  28 +
  29 + private void initData() {
  30 +
  31 + }
  32 +
  33 + private void initLister() {
  34 + btn_start.setOnClickListener(this);
  35 + }
  36 +
  37 + @Override
  38 + public void onClick(View v) {
  39 + switch (v.getId()){
  40 + case R.id.btn_start:
  41 + Intent intent = new Intent();
  42 + intent.setClass(TheStartPageActivity.this,MainActivity.class);
  43 + startActivity(intent);
  44 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  45 + break;
  46 + }
17 47 }
18 48 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java
Diff comments   View file @a1f628a
... ... @@ -10,7 +10,7 @@ import android.view.View;
10 10 import android.view.ViewGroup;
11 11  
12 12 import com.hjx.personalcenter.R;
13   -import com.hjx.personalcenter.activity.TheStartPageActivity;
  13 +import com.hjx.personalcenter.activity.ElectronicCardValidationActivity;
14 14 import com.mylhyl.circledialog.BaseCircleDialog;
15 15 import com.mylhyl.circledialog.res.values.CircleDimen;
16 16  
... ... @@ -39,8 +39,13 @@ public class ElectronicCardDialog extends BaseCircleDialog {
39 39 getView().findViewById(R.id.fill_card).setOnClickListener(new View.OnClickListener() {
40 40 @Override
41 41 public void onClick(View v) {
  42 + //有保卡信息直接进入开始界面，没有则跳转保卡信息
  43 +// Intent intent = new Intent();
  44 +// intent.setClass(getActivity(),TheStartPageActivity.class);
  45 +// startActivity(intent);
  46 +// getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
42 47 Intent intent = new Intent();
43   - intent.setClass(getActivity(),TheStartPageActivity.class);
  48 + intent.setClass(getActivity(),ElectronicCardValidationActivity.class);
44 49 startActivity(intent);
45 50 getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
46 51  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java
Diff comments   View file @a1f628a
... ... @@ -7,10 +7,12 @@ import android.support.v4.app.Fragment;
7 7 import android.view.LayoutInflater;
8 8 import android.view.View;
9 9 import android.view.ViewGroup;
  10 +import android.widget.Button;
10 11 import android.widget.TextView;
11 12  
12 13 import com.hjx.personalcenter.R;
13 14 import com.hjx.personalcenter.activity.ForgotPasswordActivity;
  15 +import com.hjx.personalcenter.activity.MainActivity;
14 16  
15 17 /**
16 18 * 登录
... ... @@ -21,8 +23,9 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
21 23 private View mView;
22 24 private int type;
23 25 private TextView tv_forget_pwd;
  26 + private Button btn_login;
24 27 public static String TABLAYOUT_FRAGMENT = "tab_fragment";
25   -
  28 + Intent intent = new Intent();
26 29 public static LoginFragment newInstance(int type) {
27 30 LoginFragment fragment = new LoginFragment();
28 31 Bundle bundle = new Bundle();
... ... @@ -47,12 +50,14 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
47 50 //初始化
48 51 private void initView(View mView) {
49 52 tv_forget_pwd = (TextView) mView.findViewById(R.id.tv_forget_pwd);
  53 + btn_login = (Button) mView.findViewById(R.id.btn_login);
50 54  
51 55 }
52 56 private void initData() {
53 57 }
54 58 private void setLister() {
55 59 tv_forget_pwd.setOnClickListener(this);
  60 + btn_login.setOnClickListener(this);
56 61 }
57 62  
58 63  
... ... @@ -60,11 +65,15 @@ public class LoginFragment extends Fragment implements View.OnClickListener {
60 65 public void onClick(View v) {
61 66 switch (v.getId()){
62 67 case R.id.tv_forget_pwd:
63   - Intent intent = new Intent();
64 68 intent.setClass(getActivity(),ForgotPasswordActivity.class);
65 69 startActivity(intent);
66 70 getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
67 71 break;
  72 + case R.id.btn_login:
  73 + intent.setClass(getActivity(),MainActivity.class);
  74 + startActivity(intent);
  75 + getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout);
  76 + break;
68 77 }
69 78  
70 79 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,50 @@
  1 +package com.hjx.personalcenter.fragment;
  2 +
  3 +import android.os.Bundle;
  4 +import android.support.annotation.Nullable;
  5 +import android.support.v4.app.Fragment;
  6 +import android.view.LayoutInflater;
  7 +import android.view.View;
  8 +import android.view.ViewGroup;
  9 +
  10 +import com.hjx.personalcenter.R;
  11 +
  12 +/**
  13 + * Created by h on 2017/8/12.
  14 + */
  15 +
  16 +public class PresonInfoFragment extends Fragment {
  17 + private View mView;
  18 + private int type;
  19 + public static String TABLAYOUT_FRAGMENT = "tab_fragment";
  20 +
  21 + public static PresonInfoFragment newInstance(int type) {
  22 + PresonInfoFragment fragment = new PresonInfoFragment();
  23 + Bundle bundle = new Bundle();
  24 + bundle.putSerializable(TABLAYOUT_FRAGMENT, type);
  25 + fragment.setArguments(bundle);
  26 + return fragment;
  27 +
  28 + }
  29 + @Override
  30 + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
  31 + if (mView == null) {
  32 + mView = inflater.inflate(R.layout.fragment_changge_presonal_info, container, false);
  33 + initView(mView);
  34 + initData();
  35 + setLister();
  36 +
  37 +
  38 + }
  39 + return mView;
  40 + }
  41 + //初始化
  42 + private void initView(View mView) {
  43 +
  44 + }
  45 + private void initData() {
  46 + }
  47 + private void setLister() {
  48 + }
  49 +
  50 +}
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,89 @@
  1 +package com.hjx.personalcenter.fragment;
  2 +
  3 +import android.os.Bundle;
  4 +import android.support.annotation.Nullable;
  5 +import android.support.v4.app.Fragment;
  6 +import android.view.LayoutInflater;
  7 +import android.view.View;
  8 +import android.view.ViewGroup;
  9 +import android.widget.GridView;
  10 +import android.widget.SimpleAdapter;
  11 +
  12 +import com.hjx.personalcenter.R;
  13 +
  14 +import java.util.ArrayList;
  15 +import java.util.HashMap;
  16 +import java.util.List;
  17 +import java.util.Map;
  18 +
  19 +/**
  20 + * Created by h on 2017/8/12.
  21 + */
  22 +
  23 +public class VersionsInfoFragment extends Fragment {
  24 + private GridView gridView;
  25 + private List<Map<String, Object>> data_list;
  26 + private SimpleAdapter sim_adapter;
  27 + private View mView;
  28 + private int type;
  29 + public static String TABLAYOUT_FRAGMENT = "tab_fragment";
  30 +
  31 + public static VersionsInfoFragment newInstance(int type) {
  32 + VersionsInfoFragment fragment = new VersionsInfoFragment();
  33 + Bundle bundle = new Bundle();
  34 + bundle.putSerializable(TABLAYOUT_FRAGMENT, type);
  35 + fragment.setArguments(bundle);
  36 + return fragment;
  37 +
  38 + }
  39 + // 图片封装为一个数组
  40 + private int[] icon = { R.mipmap.ic_launcher, R.mipmap.ic_launcher,
  41 + R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher,
  42 + R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher,
  43 + R.mipmap.ic_launcher};
  44 + private String[] subject = { "语文", "数学", "英语", "物理", "化学", "生物", "政治",
  45 + "历史", "地理" };
  46 + private String[] publish = { "人民教育出版社", "人民教育出版社", "人民教育出版社",
  47 + "人民教育出版社", "人民教育出版社", "人民教育出版社", "人民教育出版社",
  48 + "人民教育出版社", "人民教育出版社" };
  49 + @Override
  50 + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
  51 + if (mView == null) {
  52 + mView = inflater.inflate(R.layout.activity_choisetextbook, container, false);
  53 + initView(mView);
  54 + initData();
  55 + setLister();
  56 +
  57 +
  58 + }
  59 + return mView;
  60 + }
  61 + //初始化
  62 + private void initView(View mView) {
  63 + gridView =(GridView) mView.findViewById(R.id.grideview);
  64 +
  65 + }
  66 + private void initData() {
  67 + data_list = new ArrayList<Map<String, Object>>();
  68 + getData();
  69 + String [] from ={"image","text","text1"};
  70 + int [] to = {R.id.image,R.id.text};
  71 + sim_adapter = new SimpleAdapter(getActivity(), data_list, R.layout.fragment_changge_version_info_itmes, from, to);
  72 + //配置适配器
  73 + gridView.setAdapter(sim_adapter);
  74 + }
  75 + public List<Map<String, Object>> getData(){
  76 + //cion和iconName的长度是相同的，这里任选其一都可以
  77 + for(int i=0;i<icon.length;i++){
  78 + Map<String, Object> map = new HashMap<String, Object>();
  79 + map.put("image", icon[i]);
  80 + map.put("text", subject[i]);
  81 + map.put("text1", publish[i]);
  82 + data_list.add(map);
  83 + }
  84 +
  85 + return data_list;
  86 + }
  87 + private void setLister() {
  88 + }
  89 +}
... ...
PersonalCenter/app/src/main/res/layout/activity_account_management.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,160 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:orientation="vertical"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent">
  6 + <RelativeLayout
  7 + android:id="@+id/title"
  8 + android:layout_width="match_parent"
  9 + android:layout_height="wrap_content"
  10 + android:background="@color/login_text_blue"
  11 + android:minHeight="50dp" >
  12 +
  13 + <ImageView
  14 + android:id="@+id/cancel"
  15 + android:layout_width="wrap_content"
  16 + android:layout_height="wrap_content"
  17 + android:layout_centerVertical="true"
  18 + android:paddingLeft="20dp"
  19 + android:paddingRight="20dp"
  20 + android:src="@mipmap/title_back" />
  21 +
  22 + <TextView
  23 + android:id="@+id/menu_title"
  24 + android:layout_width="wrap_content"
  25 + android:layout_height="wrap_content"
  26 + android:layout_centerInParent="true"
  27 + android:text="@string/account_management"
  28 + android:textColor="@android:color/white"
  29 + android:textSize="22sp" />
  30 + </RelativeLayout>
  31 + <LinearLayout
  32 + android:layout_width="wrap_content"
  33 + android:layout_height="wrap_content"
  34 + android:orientation="horizontal"
  35 + android:layout_margin="20dp"
  36 + android:gravity="center_vertical">
  37 + <View
  38 + android:layout_width="5dp"
  39 + android:layout_height="20dp"
  40 + android:background="@color/login_text_blue">
  41 +
  42 + </View>
  43 + <TextView
  44 + android:layout_width="wrap_content"
  45 + android:layout_height="wrap_content"
  46 + android:text="账户安全"
  47 + android:layout_marginLeft="5dp"
  48 + android:textSize="22sp"
  49 + />
  50 +
  51 + </LinearLayout>
  52 + <LinearLayout
  53 + android:layout_width="match_parent"
  54 + android:layout_height="wrap_content"
  55 + android:layout_marginLeft="60dp"
  56 + android:orientation="vertical">
  57 + <LinearLayout
  58 + android:layout_width="match_parent"
  59 + android:layout_height="wrap_content">
  60 +
  61 +
  62 + <TextView
  63 + android:layout_width="0dp"
  64 + android:layout_height="wrap_content"
  65 + android:layout_weight="1.5"
  66 + android:textSize="22sp"
  67 + android:text="当前绑定手机号"/>
  68 + <TextView
  69 + android:layout_width="0dp"
  70 + android:layout_height="wrap_content"
  71 + android:layout_marginLeft="50dp"
  72 + android:layout_weight="6"
  73 + android:textSize="22sp"
  74 + android:text="123556677"/>
  75 + <TextView
  76 + android:layout_width="0dp"
  77 + android:layout_height="wrap_content"
  78 + android:layout_weight="1"
  79 + android:textSize="22sp"
  80 + android:text="更换绑定"/>
  81 + <ImageView
  82 + android:layout_width="wrap_content"
  83 + android:layout_height="wrap_content"
  84 + android:layout_weight="0.1"
  85 + android:padding="10dp"
  86 + android:src="@mipmap/youjiantou"/>
  87 + </LinearLayout>
  88 + <LinearLayout
  89 + android:layout_width="match_parent"
  90 + android:layout_marginTop="30dp"
  91 + android:layout_height="wrap_content">
  92 +
  93 +
  94 + <TextView
  95 + android:layout_width="0dp"
  96 + android:layout_height="wrap_content"
  97 + android:layout_weight="1.5"
  98 + android:textSize="22sp"
  99 + android:text="登录密码"/>
  100 + <TextView
  101 + android:layout_width="0dp"
  102 + android:layout_height="wrap_content"
  103 + android:layout_marginLeft="50dp"
  104 + android:layout_weight="6"
  105 + android:textSize="22sp"
  106 + android:text="已设置"/>
  107 + <TextView
  108 + android:layout_width="0dp"
  109 + android:layout_height="wrap_content"
  110 + android:layout_weight="1"
  111 + android:textSize="22sp"
  112 + android:text="修改密码"/>
  113 + <ImageView
  114 + android:layout_width="wrap_content"
  115 + android:layout_height="wrap_content"
  116 + android:layout_weight="0.1"
  117 + android:padding="10dp"
  118 + android:src="@mipmap/youjiantou"/>
  119 + </LinearLayout>
  120 +
  121 + </LinearLayout>
  122 +
  123 + <View
  124 + android:layout_width="match_parent"
  125 + android:layout_margin="20dp"
  126 + android:layout_height="0.7dp"
  127 + android:background="#FF909090" />
  128 + <LinearLayout
  129 + android:layout_width="wrap_content"
  130 + android:layout_height="wrap_content"
  131 + android:orientation="horizontal"
  132 + android:layout_margin="20dp"
  133 + android:gravity="center_vertical">
  134 + <View
  135 + android:layout_width="5dp"
  136 + android:layout_height="20dp"
  137 + android:background="@color/login_text_blue">
  138 +
  139 + </View>
  140 + <TextView
  141 + android:layout_width="wrap_content"
  142 + android:layout_height="wrap_content"
  143 + android:text="子账户管理"
  144 + android:layout_marginLeft="5dp"
  145 + android:textSize="22sp"
  146 + />
  147 +
  148 + </LinearLayout>
  149 + <GridView
  150 + android:id="@+id/gv_accunt"
  151 + android:layout_width="match_parent"
  152 + android:layout_height="wrap_content"
  153 + android:numColumns="3">
  154 +
  155 + </GridView>
  156 +
  157 +
  158 +
  159 +
  160 +</LinearLayout>
0 161 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/layout/activity_change_card_info.xml
View file @a145cbc
... ... @@ -1,130 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:layout_width="match_parent"
4   - android:layout_height="match_parent"
5   - android:background="#ffffffff"
6   - android:orientation="vertical">
7   -
8   - <RelativeLayout
9   - android:id="@+id/title"
10   - android:layout_width="match_parent"
11   - android:layout_height="wrap_content"
12   - android:background="@color/login_text_blue"
13   - android:minHeight="50dp">
14   -
15   - <ImageView
16   - android:id="@+id/cancel"
17   - android:layout_width="wrap_content"
18   - android:layout_height="wrap_content"
19   - android:layout_centerVertical="true"
20   - android:paddingLeft="20dp"
21   - android:paddingRight="20dp"
22   - android:src="@mipmap/title_back" />
23   -
24   - <TextView
25   - android:id="@+id/menu_title"
26   - android:layout_width="wrap_content"
27   - android:layout_height="wrap_content"
28   - android:layout_centerInParent="true"
29   - android:text="@string/string_electroniccard_info_change"
30   - android:textColor="@android:color/white"
31   - android:textSize="22sp" />
32   - </RelativeLayout>
33   -
34   - <RelativeLayout
35   - android:layout_width="match_parent"
36   - android:layout_height="match_parent"
37   - android:layout_below="@id/title"
38   - android:background="#ffffffff"
39   - android:orientation="vertical"
40   - android:paddingLeft="250dp"
41   - android:paddingRight="250dp">
42   -
43   - <EditText
44   - android:id="@+id/et_phonenumber"
45   - style="@style/login_register_edit_style"
46   - android:layout_marginTop="150dp"
47   - android:hint="手机号"
48   - android:inputType="phone" />
49   -
50   - <TextView
51   - android:id="@+id/phonenumber_error_hint"
52   - style="@style/registererrhint_style"
53   - android:layout_below="@id/et_phonenumber" />
54   -
55   - <LinearLayout
56   - android:id="@+id/rl_authcode"
57   - android:layout_width="match_parent"
58   - android:layout_height="wrap_content"
59   - android:layout_below="@id/et_phonenumber"
60   - android:layout_marginTop="30dp"
61   - android:orientation="horizontal">
62   -
63   - <EditText
64   - android:id="@+id/et_authcode"
65   - style="@style/login_register_edit_rect_style"
66   - android:layout_marginRight="-4px"
67   - android:layout_weight="1"
68   - android:hint="验证码"
69   - android:numeric="integer" />
70   -
71   - <Button
72   - android:id="@+id/btn_authcode"
73   - style="@style/login_register_btn_authcode_rect_style"
74   - android:layout_marginLeft="0px"
75   - android:layout_marginTop="0px"
76   - android:layout_weight="2"
77   - android:text="获取验证码"
78   - android:textColor="@color/btn_text_color" />
79   - </LinearLayout>
80   -
81   - <TextView
82   - android:id="@+id/authcode_error_hint"
83   - style="@style/registererrhint_style"
84   - android:layout_below="@id/rl_authcode" />
85   -
86   - <RelativeLayout
87   - android:id="@+id/pwd_rl"
88   - android:layout_width="match_parent"
89   - android:layout_height="wrap_content"
90   - android:layout_below="@id/rl_authcode"
91   - android:layout_marginTop="30dp">
92   -
93   - <EditText
94   - android:id="@+id/et_newpassword"
95   - style="@style/login_register_edit_style"
96   - android:hint="请选择地区"
97   - android:inputType="textPassword" />
98   -
99   - <ImageView
100   - android:id="@+id/iv_pwd_change"
101   - style="@style/iv_pwd_change_style" />
102   - </RelativeLayout>
103   -
104   - <TextView
105   - android:id="@+id/newpassword_error_hint"
106   - style="@style/registererrhint_style"
107   - android:layout_below="@id/pwd_rl" />
108   -
109   - <EditText
110   - android:id="@+id/et_again_newpassword"
111   - style="@style/login_register_edit_style"
112   - android:layout_below="@id/pwd_rl"
113   - android:layout_marginTop="30dp"
114   - android:hint="请选择详细地址"
115   - android:inputType="textPassword" />
116   -
117   - <TextView
118   - android:id="@+id/again_newpassword_error_hint"
119   - style="@style/registererrhint_style"
120   - android:layout_below="@id/et_again_newpassword" />
121   -
122   - <Button
123   - android:id="@+id/btn_ok"
124   - style="@style/button_login_register_style"
125   - android:layout_below="@id/et_again_newpassword"
126   - android:layout_marginTop="30dp"
127   - android:text="@string/ok" />
128   - </RelativeLayout>
129   -
130   -</RelativeLayout>
131 0 \ No newline at end of file
PersonalCenter/app/src/main/res/layout/activity_change_card_validation.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,130 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="#ffffffff"
  6 + android:orientation="vertical">
  7 +
  8 + <RelativeLayout
  9 + android:id="@+id/title"
  10 + android:layout_width="match_parent"
  11 + android:layout_height="wrap_content"
  12 + android:background="@color/login_text_blue"
  13 + android:minHeight="50dp">
  14 +
  15 + <ImageView
  16 + android:id="@+id/cancel"
  17 + android:layout_width="wrap_content"
  18 + android:layout_height="wrap_content"
  19 + android:layout_centerVertical="true"
  20 + android:paddingLeft="20dp"
  21 + android:paddingRight="20dp"
  22 + android:src="@mipmap/title_back" />
  23 +
  24 + <TextView
  25 + android:id="@+id/menu_title"
  26 + android:layout_width="wrap_content"
  27 + android:layout_height="wrap_content"
  28 + android:layout_centerInParent="true"
  29 + android:text="@string/string_electroniccard_info_change"
  30 + android:textColor="@android:color/white"
  31 + android:textSize="22sp" />
  32 + </RelativeLayout>
  33 +
  34 + <RelativeLayout
  35 + android:layout_width="match_parent"
  36 + android:layout_height="match_parent"
  37 + android:layout_below="@id/title"
  38 + android:background="#ffffffff"
  39 + android:orientation="vertical"
  40 + android:paddingLeft="250dp"
  41 + android:paddingRight="250dp">
  42 +
  43 + <EditText
  44 + android:id="@+id/et_phonenumber"
  45 + style="@style/login_register_edit_style"
  46 + android:layout_marginTop="150dp"
  47 + android:hint="手机号"
  48 + android:inputType="phone" />
  49 +
  50 + <TextView
  51 + android:id="@+id/phonenumber_error_hint"
  52 + style="@style/registererrhint_style"
  53 + android:layout_below="@id/et_phonenumber" />
  54 +
  55 + <LinearLayout
  56 + android:id="@+id/rl_authcode"
  57 + android:layout_width="match_parent"
  58 + android:layout_height="wrap_content"
  59 + android:layout_below="@id/et_phonenumber"
  60 + android:layout_marginTop="30dp"
  61 + android:orientation="horizontal">
  62 +
  63 + <EditText
  64 + android:id="@+id/et_authcode"
  65 + style="@style/login_register_edit_rect_style"
  66 + android:layout_marginRight="-4px"
  67 + android:layout_weight="1"
  68 + android:hint="验证码"
  69 + android:numeric="integer" />
  70 +
  71 + <Button
  72 + android:id="@+id/btn_authcode"
  73 + style="@style/login_register_btn_authcode_rect_style"
  74 + android:layout_marginLeft="0px"
  75 + android:layout_marginTop="0px"
  76 + android:layout_weight="2"
  77 + android:text="获取验证码"
  78 + android:textColor="@color/btn_text_color" />
  79 + </LinearLayout>
  80 +
  81 + <TextView
  82 + android:id="@+id/authcode_error_hint"
  83 + style="@style/registererrhint_style"
  84 + android:layout_below="@id/rl_authcode" />
  85 +
  86 + <RelativeLayout
  87 + android:id="@+id/pwd_rl"
  88 + android:layout_width="match_parent"
  89 + android:layout_height="wrap_content"
  90 + android:layout_below="@id/rl_authcode"
  91 + android:layout_marginTop="30dp">
  92 +
  93 + <EditText
  94 + android:id="@+id/et_newpassword"
  95 + style="@style/login_register_edit_style"
  96 + android:hint="请选择地区"
  97 + android:inputType="textPassword" />
  98 +
  99 + <ImageView
  100 + android:id="@+id/iv_pwd_change"
  101 + style="@style/iv_pwd_change_style" />
  102 + </RelativeLayout>
  103 +
  104 + <TextView
  105 + android:id="@+id/newpassword_error_hint"
  106 + style="@style/registererrhint_style"
  107 + android:layout_below="@id/pwd_rl" />
  108 +
  109 + <EditText
  110 + android:id="@+id/et_again_newpassword"
  111 + style="@style/login_register_edit_style"
  112 + android:layout_below="@id/pwd_rl"
  113 + android:layout_marginTop="30dp"
  114 + android:hint="请选择详细地址"
  115 + android:inputType="textPassword" />
  116 +
  117 + <TextView
  118 + android:id="@+id/again_newpassword_error_hint"
  119 + style="@style/registererrhint_style"
  120 + android:layout_below="@id/et_again_newpassword" />
  121 +
  122 + <Button
  123 + android:id="@+id/btn_ok"
  124 + style="@style/button_login_register_style"
  125 + android:layout_below="@id/et_again_newpassword"
  126 + android:layout_marginTop="30dp"
  127 + android:text="@string/ok" />
  128 + </RelativeLayout>
  129 +
  130 +</RelativeLayout>
0 131 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/layout/activity_change_preson_info.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,68 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:tools="http://schemas.android.com/tools"
  4 + android:id="@android:id/tabhost"
  5 + android:layout_width="fill_parent"
  6 + android:layout_height="fill_parent"
  7 + android:background="@color/white"
  8 + tools:context="com.hjx.personalcenter.activity.LoginAndRegisterActivity">
  9 + <RelativeLayout
  10 + android:id="@+id/title"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="50dp"
  13 + android:background="@color/login_text_blue">
  14 +
  15 + <ImageView
  16 + android:id="@+id/cancel"
  17 + android:layout_width="wrap_content"
  18 + android:layout_height="match_parent"
  19 + android:paddingLeft="20dp"
  20 + android:paddingRight="20dp"
  21 + android:src="@mipmap/title_back" />
  22 +
  23 + <TextView
  24 + android:id="@+id/menu_title"
  25 + android:layout_width="wrap_content"
  26 + android:layout_height="match_parent"
  27 + android:layout_centerInParent="true"
  28 + android:gravity="center_vertical"
  29 + android:text="@string/changge_preson"
  30 + android:textColor="@android:color/white"
  31 + android:textSize="22sp" />
  32 + <TextView
  33 + android:id="@+id/feedback_sub"
  34 + android:layout_width="wrap_content"
  35 + android:layout_height="match_parent"
  36 + android:paddingLeft="20dp"
  37 + android:paddingRight="20dp"
  38 + android:gravity="center_vertical"
  39 + android:layout_alignParentRight="true"
  40 + android:text="保存"
  41 + android:textColor="@android:color/white"
  42 + android:textSize="22sp" />
  43 +
  44 +
  45 + </RelativeLayout>
  46 +
  47 + <LinearLayout
  48 + android:layout_width="wrap_content"
  49 + android:layout_height="wrap_content"
  50 + android:layout_marginTop="20dp"
  51 + android:layout_below="@+id/title"
  52 + android:orientation="vertical">
  53 +
  54 + <com.hjx.personalcenter.thirdparty.SlidingTabLayout
  55 + android:id="@+id/TabLayout_id"
  56 + android:layout_gravity="center"
  57 + android:layout_width="wrap_content"
  58 + android:layout_height="50dp">
  59 + </com.hjx.personalcenter.thirdparty.SlidingTabLayout>
  60 +
  61 + <android.support.v4.view.ViewPager
  62 + android:id="@+id/viewpager_login"
  63 + android:layout_width="match_parent"
  64 + android:layout_height="match_parent"
  65 + android:background="@color/white" />
  66 + </LinearLayout>
  67 +
  68 +</RelativeLayout>
0 69 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/layout/activity_choisetextbook_items.xml
Diff comments   View file @a1f628a
... ... @@ -3,19 +3,21 @@
3 3 android:orientation="vertical"
4 4 android:layout_width="match_parent"
5 5 android:layout_height="match_parent"
6   - android:gravity="center"
7   - android:padding="20dp">
  6 + android:gravity="center">
  7 +
  8 +
8 9 <ImageView
9 10 android:src="@mipmap/ic_launcher"
10 11 android:id="@+id/image"
11   - android:layout_width="80dp"
12   - android:layout_height="120dp"
  12 + android:layout_width="100dp"
  13 + android:background="@drawable/corcle_black_bg"
  14 + android:layout_height="150dp"
13 15  
14 16 />
15 17 <TextView
16 18 android:id="@+id/text"
17 19 android:layout_marginTop="5dp"
18   - android:textSize="17sp"
  20 + android:textSize="22sp"
19 21 android:layout_width="wrap_content"
20 22 android:layout_height="wrap_content"
21 23 android:textColor="@color/login_text_black"
... ... @@ -23,8 +25,8 @@
23 25 />
24 26 <TextView
25 27 android:id="@+id/tv_publish"
26   - android:layout_marginTop="5dp"
27   - android:textSize="14sp"
  28 + android:layout_marginTop="10dp"
  29 + android:textSize="18sp"
28 30 android:layout_width="wrap_content"
29 31 android:layout_height="wrap_content"
30 32 android:textColor="@color/login_text_black"
... ...
PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
Diff comments   View file @a1f628a
... ... @@ -46,9 +46,10 @@
46 46 android:orientation="horizontal">
47 47  
48 48 <LinearLayout
49   - android:layout_width="wrap_content"
  49 + android:layout_width="0dp"
50 50 android:layout_height="wrap_content"
51 51 android:layout_marginLeft="200dp"
  52 + android:layout_weight="1"
52 53 android:gravity="center_vertical">
53 54  
54 55 <ImageView
... ... @@ -68,9 +69,10 @@
68 69 </LinearLayout>
69 70  
70 71 <LinearLayout
71   - android:layout_width="wrap_content"
  72 + android:layout_width="0dp"
72 73 android:layout_height="80dp"
73   - android:layout_marginLeft="200dp"
  74 + android:layout_weight="1"
  75 + android:layout_marginLeft="80dp"
74 76 android:gravity="center_vertical">
75 77  
76 78 <TextView
... ... @@ -99,8 +101,9 @@
99 101 android:orientation="horizontal">
100 102  
101 103 <LinearLayout
102   - android:layout_width="wrap_content"
  104 + android:layout_width="0dp"
103 105 android:layout_height="60dp"
  106 + android:layout_weight="1"
104 107 android:layout_marginLeft="200dp"
105 108 android:gravity="center_vertical">
106 109  
... ... @@ -122,9 +125,10 @@
122 125 </LinearLayout>
123 126  
124 127 <LinearLayout
125   - android:layout_width="wrap_content"
  128 + android:layout_width="0dp"
126 129 android:layout_height="60dp"
127   - android:layout_marginLeft="250dp"
  130 + android:layout_weight="1"
  131 + android:layout_marginLeft="80dp"
128 132 android:gravity="center_vertical">
129 133  
130 134 <TextView
... ... @@ -136,7 +140,7 @@
136 140 <TextView
137 141 android:layout_width="wrap_content"
138 142 android:layout_height="wrap_content"
139   - android:layout_marginLeft="98dp"
  143 + android:layout_marginLeft="60dp"
140 144 android:background="@null"
141 145 android:text="北京市昭阳区三里屯"
142 146 android:textSize="22sp" />
... ... @@ -163,8 +167,9 @@
163 167 android:orientation="horizontal">
164 168  
165 169 <LinearLayout
166   - android:layout_width="wrap_content"
  170 + android:layout_width="0dp"
167 171 android:layout_height="60dp"
  172 + android:layout_weight="1"
168 173 android:layout_marginLeft="200dp"
169 174 android:gravity="center_vertical">
170 175  
... ... @@ -185,9 +190,10 @@
185 190 </LinearLayout>
186 191  
187 192 <LinearLayout
188   - android:layout_width="wrap_content"
  193 + android:layout_width="0dp"
189 194 android:layout_height="60dp"
190   - android:layout_marginLeft="210dp"
  195 + android:layout_weight="1"
  196 + android:layout_marginLeft="80dp"
191 197 android:gravity="center_vertical">
192 198  
193 199 <TextView
... ... @@ -200,7 +206,7 @@
200 206 <TextView
201 207 android:layout_width="wrap_content"
202 208 android:layout_height="wrap_content"
203   - android:layout_marginLeft="25dp"
  209 + android:layout_marginLeft="60dp"
204 210 android:background="@null"
205 211 android:text="4433322-334--34"
206 212 android:textColor="@color/btn_text_color"
... ... @@ -216,8 +222,9 @@
216 222 android:orientation="horizontal">
217 223  
218 224 <LinearLayout
219   - android:layout_width="wrap_content"
  225 + android:layout_width="0dp"
220 226 android:layout_height="60dp"
  227 + android:layout_weight="1"
221 228 android:layout_marginLeft="200dp"
222 229 android:gravity="center_vertical">
223 230  
... ... @@ -238,9 +245,10 @@
238 245 </LinearLayout>
239 246  
240 247 <LinearLayout
241   - android:layout_width="wrap_content"
  248 + android:layout_width="0dp"
242 249 android:layout_height="60dp"
243   - android:layout_marginLeft="210dp"
  250 + android:layout_weight="1"
  251 + android:layout_marginLeft="80dp"
244 252 android:gravity="center_vertical">
245 253  
246 254 <TextView
... ... @@ -253,7 +261,7 @@
253 261 <TextView
254 262 android:layout_width="wrap_content"
255 263 android:layout_height="wrap_content"
256   - android:layout_marginLeft="25dp"
  264 + android:layout_marginLeft="60dp"
257 265 android:text="啥啥啥 专卖店"
258 266 android:textColor="@color/btn_text_color"
259 267 android:textSize="22sp" />
... ... @@ -268,8 +276,9 @@
268 276 android:orientation="horizontal">
269 277  
270 278 <LinearLayout
271   - android:layout_width="wrap_content"
  279 + android:layout_width="0dp"
272 280 android:layout_height="60dp"
  281 + android:layout_weight="1"
273 282 android:layout_marginLeft="200dp"
274 283 android:gravity="center_vertical">
275 284  
... ... @@ -301,9 +310,10 @@
301 310 </LinearLayout>
302 311  
303 312 <LinearLayout
304   - android:layout_width="wrap_content"
  313 + android:layout_width="0dp"
305 314 android:layout_height="60dp"
306   - android:layout_marginLeft="250dp"
  315 + android:layout_weight="1"
  316 + android:layout_marginLeft="80dp"
307 317 android:gravity="center_vertical">
308 318  
309 319 <TextView
... ... @@ -315,7 +325,7 @@
315 325 <TextView
316 326 android:layout_width="wrap_content"
317 327 android:layout_height="wrap_content"
318   - android:layout_marginLeft="98dp"
  328 + android:layout_marginLeft="60dp"
319 329 android:background="@null"
320 330 android:text="1111111"
321 331 android:textSize="22sp" />
... ...
PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml
Diff comments   View file @a1f628a
... ... @@ -41,7 +41,7 @@
41 41 <LinearLayout
42 42 android:layout_width="wrap_content"
43 43 android:layout_height="wrap_content"
44   - android:layout_marginTop="20dp"
  44 + android:layout_marginTop="60dp"
45 45 android:orientation="horizontal">
46 46  
47 47 <View
... ... @@ -53,7 +53,7 @@
53 53 </View>
54 54  
55 55 <View
56   - android:layout_width="400dp"
  56 + android:layout_width="450dp"
57 57 android:layout_height="0.7dp"
58 58 android:layout_marginLeft="80dp"
59 59 android:background="@color/electronic_text">
... ... @@ -66,13 +66,14 @@
66 66 <LinearLayout
67 67 android:layout_width="match_parent"
68 68 android:layout_height="wrap_content"
  69 + android:layout_marginLeft="200dp"
69 70 android:gravity="center_vertical"
70 71 android:orientation="horizontal">
71 72  
72 73 <LinearLayout
73   - android:layout_width="wrap_content"
  74 + android:layout_width="0dp"
74 75 android:layout_height="80dp"
75   - android:layout_marginLeft="200dp"
  76 + android:layout_weight="1"
76 77 android:gravity="center_vertical">
77 78  
78 79 <TextView
... ... @@ -94,13 +95,13 @@
94 95 </LinearLayout>
95 96  
96 97 <LinearLayout
97   - android:layout_width="wrap_content"
  98 + android:layout_width="0dp"
98 99 android:layout_height="80dp"
99   - android:layout_marginLeft="300dp"
  100 + android:layout_weight="1"
100 101 android:gravity="center_vertical">
101 102  
102 103 <TextView
103   - android:layout_width="wrap_content"
  104 + android:layout_width="150dp"
104 105 android:layout_height="wrap_content"
105 106 android:text="购买地址"
106 107 android:textColor="@color/pickerview_wheelview_textcolor_center"
... ... @@ -109,7 +110,7 @@
109 110 <TextView
110 111 android:layout_width="wrap_content"
111 112 android:layout_height="wrap_content"
112   - android:layout_marginLeft="60dp"
  113 + android:layout_marginLeft="20dp"
113 114 android:text="请选择地区"
114 115 android:textColor="@color/btn_text_color"
115 116 android:textSize="22sp" />
... ... @@ -117,7 +118,7 @@
117 118 <ImageView
118 119 android:layout_width="wrap_content"
119 120 android:layout_height="wrap_content"
120   - android:layout_marginLeft="50dp"
  121 + android:layout_marginLeft="60dp"
121 122 android:src="@mipmap/xiajiantou">
122 123  
123 124 </ImageView>
... ... @@ -139,7 +140,7 @@
139 140 </View>
140 141  
141 142 <View
142   - android:layout_width="400dp"
  143 + android:layout_width="450dp"
143 144 android:layout_height="0.7dp"
144 145 android:layout_marginLeft="80dp"
145 146 android:background="@color/electronic_text">
... ... @@ -152,13 +153,14 @@
152 153 <LinearLayout
153 154 android:layout_width="match_parent"
154 155 android:layout_height="wrap_content"
  156 + android:layout_marginLeft="200dp"
155 157 android:gravity="center_vertical"
156 158 android:orientation="horizontal">
157 159  
158 160 <LinearLayout
159   - android:layout_width="wrap_content"
  161 + android:layout_width="0dp"
160 162 android:layout_height="80dp"
161   - android:layout_marginLeft="200dp"
  163 + android:layout_weight="1"
162 164 android:gravity="center_vertical">
163 165  
164 166 <TextView
... ... @@ -178,7 +180,7 @@
178 180 <ImageView
179 181 android:layout_width="wrap_content"
180 182 android:layout_height="wrap_content"
181   - android:layout_marginLeft="50dp"
  183 + android:layout_marginLeft="60dp"
182 184 android:src="@mipmap/xiajiantou">
183 185  
184 186 </ImageView>
... ... @@ -187,13 +189,13 @@
187 189 </LinearLayout>
188 190  
189 191 <LinearLayout
190   - android:layout_width="wrap_content"
  192 + android:layout_width="0dp"
191 193 android:layout_height="80dp"
192   - android:layout_marginLeft="200dp"
  194 + android:layout_weight="1"
193 195 android:gravity="center_vertical">
194 196  
195 197 <TextView
196   - android:layout_width="wrap_content"
  198 + android:layout_width="150dp"
197 199 android:layout_height="wrap_content"
198 200 android:text=" "
199 201 android:textColor="@color/white"
... ... @@ -202,7 +204,7 @@
202 204 <EditText
203 205 android:layout_width="wrap_content"
204 206 android:layout_height="wrap_content"
205   - android:layout_marginLeft="98dp"
  207 + android:layout_marginLeft="20dp"
206 208 android:background="@null"
207 209 android:hint="请输入商店名称"
208 210 android:textSize="22sp" />
... ... @@ -226,7 +228,7 @@
226 228 </View>
227 229  
228 230 <View
229   - android:layout_width="400dp"
  231 + android:layout_width="450dp"
230 232 android:layout_height="0.7dp"
231 233 android:layout_marginLeft="80dp"
232 234 android:background="@color/electronic_text">
... ... @@ -239,13 +241,14 @@
239 241 <LinearLayout
240 242 android:layout_width="match_parent"
241 243 android:layout_height="wrap_content"
  244 + android:layout_marginLeft="200dp"
242 245 android:gravity="center_vertical"
243 246 android:orientation="horizontal">
244 247  
245 248 <LinearLayout
246   - android:layout_width="wrap_content"
  249 + android:layout_width="0dp"
247 250 android:layout_height="80dp"
248   - android:layout_marginLeft="200dp"
  251 + android:layout_weight="1"
249 252 android:gravity="center_vertical">
250 253  
251 254 <TextView
... ... @@ -266,13 +269,13 @@
266 269 </LinearLayout>
267 270  
268 271 <LinearLayout
269   - android:layout_width="wrap_content"
  272 + android:layout_width="0dp"
270 273 android:layout_height="80dp"
271   - android:layout_marginLeft="210dp"
  274 + android:layout_weight="1"
272 275 android:gravity="center_vertical">
273 276  
274 277 <TextView
275   - android:layout_width="wrap_content"
  278 + android:layout_width="150dp"
276 279 android:layout_height="wrap_content"
277 280 android:text="本地售后电话"
278 281 android:textColor="@color/pickerview_wheelview_textcolor_center"
... ... @@ -281,10 +284,10 @@
281 284 <EditText
282 285 android:layout_width="wrap_content"
283 286 android:layout_height="wrap_content"
284   - android:layout_marginLeft="25dp"
  287 + android:layout_marginLeft="20dp"
285 288 android:background="@null"
286 289 android:hint="请输入"
287   - android:textColor="@color/btn_text_color"
  290 + android:textColor="@color/pickerview_wheelview_textcolor_center"
288 291 android:textSize="22sp" />
289 292 </LinearLayout>
290 293  
... ... @@ -305,7 +308,7 @@
305 308 </View>
306 309  
307 310 <View
308   - android:layout_width="400dp"
  311 + android:layout_width="450dp"
309 312 android:layout_height="0.7dp"
310 313 android:layout_marginLeft="80dp"
311 314 android:background="@color/electronic_text">
... ... @@ -318,14 +321,15 @@
318 321 <LinearLayout
319 322 android:layout_width="match_parent"
320 323 android:layout_height="wrap_content"
  324 + android:layout_marginLeft="200dp"
321 325 android:gravity="center_vertical"
322 326 android:orientation="horizontal">
323 327  
324 328 <LinearLayout
325 329 android:id="@+id/lineL_buy_time"
326   - android:layout_width="wrap_content"
  330 + android:layout_width="0dp"
327 331 android:layout_height="80dp"
328   - android:layout_marginLeft="200dp"
  332 + android:layout_weight="1"
329 333 android:gravity="center_vertical">
330 334  
331 335 <TextView
... ... @@ -346,7 +350,7 @@
346 350 <ImageView
347 351 android:layout_width="wrap_content"
348 352 android:layout_height="wrap_content"
349   - android:layout_marginLeft="50dp"
  353 + android:layout_marginLeft="60dp"
350 354 android:src="@mipmap/xiajiantou">
351 355  
352 356 </ImageView>
... ... @@ -358,7 +362,6 @@
358 362 <LinearLayout
359 363 android:layout_width="wrap_content"
360 364 android:layout_height="wrap_content"
361   -
362 365 android:orientation="horizontal">
363 366  
364 367 <View
... ... @@ -370,10 +373,11 @@
370 373 </View>
371 374  
372 375  
  376 +
373 377 </LinearLayout>
374 378  
375 379 <Button
376   - android:id="@+id/btn_ok"
  380 + android:id="@+id/btn_change_info"
377 381 style="@style/button_login_register_style"
378 382 android:layout_marginLeft="200dp"
379 383 android:layout_marginRight="200dp"
... ...
PersonalCenter/app/src/main/res/layout/activity_electroniccard_validation.xml
Diff comments   View file @a1f628a
... ... @@ -87,7 +87,7 @@
87 87 android:layout_below="@id/pwd_rl" />
88 88  
89 89 <Button
90   - android:id="@+id/btn_register"
  90 + android:id="@+id/btn_card_valiyanzhen"
91 91 style="@style/button_login_register_style"
92 92 android:layout_below="@id/rl_authcode"
93 93 android:layout_marginTop="30dp"
... ...
PersonalCenter/app/src/main/res/layout/activity_main.xml
Diff comments   View file @a1f628a
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 android:layout_width="match_parent"
4   - android:layout_height="match_parent">
5   -
6   - <TextView
7   - android:id="@+id/ssss"
8   - android:layout_width="wrap_content"
9   - android:layout_height="wrap_content"
10   - android:text="Hello World!" />
11   -</RelativeLayout>
  4 + android:layout_height="match_parent"
  5 + android:orientation="vertical">
  6 +
  7 + <RelativeLayout
  8 + android:id="@+id/title"
  9 + android:layout_width="match_parent"
  10 + android:layout_height="50dp"
  11 + android:background="@color/login_text_blue">
  12 +
  13 + <ImageView
  14 + android:id="@+id/cancel"
  15 + android:layout_width="wrap_content"
  16 + android:layout_height="match_parent"
  17 + android:paddingLeft="20dp"
  18 + android:paddingRight="20dp"
  19 + android:src="@mipmap/title_back" />
  20 +
  21 + <TextView
  22 + android:id="@+id/menu_title"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="match_parent"
  25 + android:layout_centerInParent="true"
  26 + android:gravity="center_vertical"
  27 + android:text="@string/titel_preson"
  28 + android:textColor="@android:color/white"
  29 + android:textSize="22sp" />
  30 +
  31 + <ImageView
  32 + android:layout_width="wrap_content"
  33 + android:layout_height="match_parent"
  34 + android:layout_marginLeft="10dp"
  35 + android:layout_toLeftOf="@+id/iv_skin"
  36 + android:gravity="center_vertical"
  37 + android:padding="10dp"
  38 + android:src="@mipmap/shezhi"
  39 + android:textColor="@android:color/white"
  40 + android:textSize="22sp" />
  41 +
  42 + <ImageView
  43 + android:id="@+id/iv_skin"
  44 + android:layout_width="wrap_content"
  45 + android:layout_height="match_parent"
  46 + android:layout_marginLeft="10dp"
  47 + android:layout_toLeftOf="@+id/iv_imformatioan"
  48 + android:gravity="center_vertical"
  49 + android:padding="10dp"
  50 + android:src="@mipmap/pifu"
  51 + android:textColor="@android:color/white"
  52 + android:textSize="22sp" />
  53 +
  54 + <ImageView
  55 + android:id="@+id/iv_imformatioan"
  56 + android:layout_width="wrap_content"
  57 + android:layout_height="match_parent"
  58 + android:layout_alignParentRight="true"
  59 + android:layout_marginLeft="20dp"
  60 + android:gravity="center_vertical"
  61 + android:padding="10dp"
  62 + android:src="@mipmap/fankui"
  63 + android:textColor="@android:color/white"
  64 + android:textSize="22sp" />
  65 +
  66 +
  67 + </RelativeLayout>
  68 +
  69 + <LinearLayout
  70 + android:layout_width="match_parent"
  71 + android:layout_height="match_parent">
  72 +
  73 + <LinearLayout
  74 + android:layout_width="0dp"
  75 + android:layout_height="match_parent"
  76 + android:layout_weight="1"
  77 + android:orientation="vertical">
  78 +
  79 + <ImageView
  80 + android:layout_width="wrap_content"
  81 + android:layout_height="wrap_content"
  82 + android:layout_margin="20dp"
  83 + android:padding="10dp"
  84 + android:src="@mipmap/card_icoc" />
  85 +
  86 + <LinearLayout
  87 + android:layout_width="match_parent"
  88 + android:layout_height="wrap_content"
  89 + android:gravity="center"
  90 + android:orientation="horizontal">
  91 +
  92 + <ImageView
  93 + android:layout_width="wrap_content"
  94 + android:layout_height="wrap_content"
  95 + android:layout_marginLeft="30dp"
  96 + android:src="@mipmap/header_default" />
  97 +
  98 + <TextView
  99 + android:layout_width="wrap_content"
  100 + android:layout_height="wrap_content"
  101 + android:layout_marginLeft="18dp"
  102 + android:background="@drawable/corcle_blue_bg"
  103 + android:paddingLeft="5dp"
  104 + android:paddingRight="5dp"
  105 + android:text="签到"
  106 + android:textColor="@color/login_text_blue"
  107 + android:textSize="18sp" />
  108 +
  109 + </LinearLayout>
  110 +
  111 + <LinearLayout
  112 + android:layout_width="match_parent"
  113 + android:layout_height="wrap_content"
  114 + android:layout_marginLeft="20dp"
  115 + android:layout_marginTop="20dp"
  116 + android:orientation="horizontal">
  117 +
  118 + <TextView
  119 + android:layout_width="wrap_content"
  120 + android:layout_height="wrap_content"
  121 + android:text="熊巍"
  122 + android:textSize="20dp" />
  123 +
  124 + <ImageView
  125 + android:layout_width="wrap_content"
  126 + android:layout_height="wrap_content"
  127 + android:layout_marginLeft="90dp"
  128 + android:src="@mipmap/men" />
  129 +
  130 + </LinearLayout>
  131 +
  132 + <LinearLayout
  133 + android:layout_width="match_parent"
  134 + android:layout_height="wrap_content"
  135 + android:layout_marginLeft="20dp"
  136 + android:layout_marginTop="20dp"
  137 + android:gravity="center"
  138 + android:orientation="horizontal">
  139 +
  140 + <TextView
  141 + android:layout_width="0dp"
  142 + android:layout_height="wrap_content"
  143 + android:layout_weight="5"
  144 + android:text="阿士大夫撒打发士大夫士大夫撒的范德萨"
  145 + android:textSize="18sp" />
  146 +
  147 + <ImageView
  148 + android:layout_width="0dp"
  149 + android:layout_height="wrap_content"
  150 + android:layout_weight="1"
  151 + android:padding="10dp"
  152 + android:src="@mipmap/pencil" />
  153 +
  154 +
  155 + </LinearLayout>
  156 +
  157 + <View
  158 + android:layout_width="match_parent"
  159 + android:layout_height="0.7dp"
  160 + android:layout_marginTop="10dp"
  161 + android:background="@color/cutoff_line">
  162 +
  163 + </View>
  164 +
  165 + <LinearLayout
  166 + android:layout_width="match_parent"
  167 + android:layout_height="wrap_content"
  168 + android:layout_marginTop="20dp"
  169 + android:orientation="vertical">
  170 +
  171 + <LinearLayout
  172 + android:layout_width="match_parent"
  173 + android:layout_height="wrap_content"
  174 + android:gravity="center_vertical"
  175 + android:orientation="horizontal">
  176 +
  177 + <ImageView
  178 + android:layout_width="0dp"
  179 + android:layout_height="wrap_content"
  180 + android:layout_weight="1"
  181 + android:src="@mipmap/wodecuoti" />
  182 +
  183 + <TextView
  184 + android:layout_width="0dp"
  185 + android:layout_height="wrap_content"
  186 + android:layout_weight="5"
  187 + android:text="我的错题"
  188 + android:textSize="20sp" />
  189 +
  190 + <ImageView
  191 + android:layout_width="0dp"
  192 + android:layout_height="wrap_content"
  193 + android:layout_weight="1"
  194 + android:src="@mipmap/youjiantou" />
  195 +
  196 + </LinearLayout>
  197 +
  198 + <LinearLayout
  199 + android:layout_width="match_parent"
  200 + android:layout_height="wrap_content"
  201 + android:layout_marginTop="20dp"
  202 + android:gravity="center_vertical"
  203 + android:orientation="horizontal">
  204 +
  205 + <ImageView
  206 + android:layout_width="0dp"
  207 + android:layout_height="wrap_content"
  208 + android:layout_weight="1"
  209 + android:src="@mipmap/wodebiji" />
  210 +
  211 + <TextView
  212 + android:layout_width="0dp"
  213 + android:layout_height="wrap_content"
  214 + android:layout_weight="5"
  215 + android:text="我的笔记"
  216 + android:textSize="20sp" />
  217 +
  218 + <ImageView
  219 + android:layout_width="0dp"
  220 + android:layout_height="wrap_content"
  221 + android:layout_weight="1"
  222 + android:src="@mipmap/youjiantou" />
  223 +
  224 + </LinearLayout>
  225 +
  226 + <LinearLayout
  227 + android:layout_width="match_parent"
  228 + android:layout_height="wrap_content"
  229 + android:layout_marginTop="20dp"
  230 + android:gravity="center_vertical"
  231 + android:orientation="horizontal">
  232 +
  233 + <ImageView
  234 + android:layout_width="0dp"
  235 + android:layout_height="wrap_content"
  236 + android:layout_weight="1"
  237 + android:src="@mipmap/wodeshoucang" />
  238 +
  239 + <TextView
  240 + android:layout_width="0dp"
  241 + android:layout_height="wrap_content"
  242 + android:layout_weight="5"
  243 + android:text="我的收藏"
  244 + android:textSize="20sp" />
  245 +
  246 + <ImageView
  247 + android:layout_width="0dp"
  248 + android:layout_height="wrap_content"
  249 + android:layout_weight="1"
  250 + android:src="@mipmap/youjiantou" />
  251 +
  252 + </LinearLayout>
  253 +
  254 + <LinearLayout
  255 + android:layout_width="match_parent"
  256 + android:layout_height="wrap_content"
  257 + android:layout_marginTop="20dp"
  258 + android:gravity="center_vertical"
  259 + android:orientation="horizontal">
  260 +
  261 + <ImageView
  262 + android:layout_width="0dp"
  263 + android:layout_height="wrap_content"
  264 + android:layout_weight="1"
  265 + android:src="@mipmap/wodebanji" />
  266 +
  267 + <TextView
  268 + android:layout_width="0dp"
  269 + android:layout_height="wrap_content"
  270 + android:layout_weight="5"
  271 + android:text="我的班级"
  272 + android:textSize="20sp" />
  273 +
  274 + <ImageView
  275 + android:layout_width="0dp"
  276 + android:layout_height="wrap_content"
  277 + android:layout_weight="1"
  278 + android:src="@mipmap/youjiantou" />
  279 +
  280 + </LinearLayout>
  281 +
  282 +
  283 + </LinearLayout>
  284 +
  285 + <LinearLayout
  286 + android:layout_width="match_parent"
  287 + android:layout_height="wrap_content"
  288 + android:layout_marginTop="100dp"
  289 + android:background="@mipmap/xiaoguanggao">
  290 +
  291 + </LinearLayout>
  292 +
  293 +
  294 + </LinearLayout>
  295 +
  296 +
  297 + <View
  298 + android:layout_width="0.7dp"
  299 + android:layout_height="match_parent"
  300 + android:background="@color/cutoff_line">
  301 +
  302 + </View>
  303 +
  304 + <LinearLayout
  305 + android:layout_width="0dp"
  306 + android:layout_height="match_parent"
  307 + android:layout_weight="2.5"
  308 + android:orientation="vertical">
  309 +
  310 + <LinearLayout
  311 + android:layout_width="match_parent"
  312 + android:layout_height="wrap_content"
  313 + android:layout_margin="20dp"
  314 + android:gravity="center_vertical"
  315 + android:orientation="horizontal">
  316 +
  317 + <View
  318 + android:layout_width="5dp"
  319 + android:layout_height="20dp"
  320 + android:background="@color/login_text_blue">
  321 +
  322 + </View>
  323 +
  324 + <TextView
  325 + android:layout_width="wrap_content"
  326 + android:layout_height="wrap_content"
  327 + android:layout_marginLeft="5dp"
  328 + android:text="最近学习"
  329 + android:textSize="22sp" />
  330 +
  331 + </LinearLayout>
  332 +
  333 + <LinearLayout
  334 + android:layout_width="match_parent"
  335 + android:layout_height="wrap_content">
  336 +
  337 + <TextView
  338 + android:id="@+id/list_item_study"
  339 + android:layout_width="match_parent"
  340 + android:layout_height="100dp"
  341 + android:layout_marginLeft="20dp"
  342 + android:layout_marginTop="10dp"
  343 + android:gravity="center"
  344 + android:text="这里需要显示水平滑动的" />
  345 + </LinearLayout>
  346 +
  347 + <View
  348 + android:layout_width="match_parent"
  349 + android:layout_height="0.7dp"
  350 + android:background="@color/cutoff_line">
  351 +
  352 + </View>
  353 +
  354 + <LinearLayout
  355 + android:layout_width="match_parent"
  356 + android:layout_height="wrap_content"
  357 + android:layout_margin="20dp"
  358 + android:gravity="center_vertical"
  359 + android:orientation="horizontal">
  360 +
  361 + <View
  362 + android:layout_width="5dp"
  363 + android:layout_height="20dp"
  364 + android:background="@color/login_text_blue">
  365 +
  366 + </View>
  367 +
  368 + <TextView
  369 + android:layout_width="0dp"
  370 + android:layout_height="wrap_content"
  371 + android:layout_marginLeft="5dp"
  372 + android:layout_weight="1"
  373 + android:text="个人信息"
  374 + android:textSize="22sp" />
  375 +
  376 + <TextView
  377 + android:layout_width="0dp"
  378 + android:layout_height="wrap_content"
  379 + android:layout_marginLeft="5dp"
  380 + android:layout_weight="0.1"
  381 + android:text="编辑"
  382 + android:textSize="22sp" />
  383 +
  384 + <ImageView
  385 + android:layout_width="0dp"
  386 + android:layout_height="wrap_content"
  387 + android:layout_weight="0.1"
  388 +
  389 + android:src="@mipmap/youjiantou" />
  390 +
  391 +
  392 + </LinearLayout>
  393 +
  394 + <LinearLayout
  395 + android:layout_width="match_parent"
  396 + android:layout_height="wrap_content"
  397 + android:layout_marginLeft="50dp"
  398 + android:layout_marginTop="20dp"
  399 + android:orientation="vertical">
  400 +
  401 + <LinearLayout
  402 + android:layout_width="match_parent"
  403 + android:layout_height="wrap_content"
  404 + android:gravity="center_vertical"
  405 + android:orientation="horizontal">
  406 +
  407 + <TextView
  408 + android:layout_width="0dp"
  409 + android:layout_height="wrap_content"
  410 + android:layout_weight="1"
  411 + android:text="我的错题"
  412 + android:textSize="20sp" />
  413 +
  414 + <TextView
  415 + android:layout_width="0dp"
  416 + android:layout_height="wrap_content"
  417 + android:layout_weight="2"
  418 + android:text="我的错题"
  419 + android:textSize="20sp" />
  420 +
  421 + <TextView
  422 + android:layout_width="1dp"
  423 + android:layout_height="wrap_content"
  424 + android:layout_weight="1"
  425 + android:text="我的错题"
  426 + android:textSize="20sp" />
  427 +
  428 + <TextView
  429 + android:layout_width="0dp"
  430 + android:layout_height="wrap_content"
  431 + android:layout_weight="2"
  432 + android:text="我的错题"
  433 + android:textSize="20sp" />
  434 + </LinearLayout>
  435 +
  436 + <LinearLayout
  437 + android:layout_width="match_parent"
  438 + android:layout_height="wrap_content"
  439 + android:layout_marginTop="20dp"
  440 + android:gravity="center_vertical"
  441 + android:orientation="horizontal">
  442 +
  443 + <TextView
  444 + android:layout_width="0dp"
  445 + android:layout_height="wrap_content"
  446 + android:layout_weight="1"
  447 + android:text="我的错题"
  448 + android:textSize="20sp" />
  449 +
  450 + <TextView
  451 + android:layout_width="0dp"
  452 + android:layout_height="wrap_content"
  453 + android:layout_weight="2"
  454 + android:text="我的错题"
  455 + android:textSize="20sp" />
  456 +
  457 + <TextView
  458 + android:layout_width="1dp"
  459 + android:layout_height="wrap_content"
  460 + android:layout_weight="1"
  461 + android:text="我的错题"
  462 + android:textSize="20sp" />
  463 +
  464 + <TextView
  465 + android:layout_width="0dp"
  466 + android:layout_height="wrap_content"
  467 + android:layout_weight="2"
  468 + android:text="我的错题"
  469 + android:textSize="20sp" />
  470 + </LinearLayout>
  471 +
  472 + <LinearLayout
  473 + android:layout_width="match_parent"
  474 + android:layout_height="wrap_content"
  475 + android:layout_marginTop="20dp"
  476 + android:gravity="center_vertical"
  477 + android:orientation="horizontal">
  478 +
  479 + <TextView
  480 + android:layout_width="0dp"
  481 + android:layout_height="wrap_content"
  482 + android:layout_weight="1"
  483 + android:text="我的错题"
  484 + android:textSize="20sp" />
  485 +
  486 + <TextView
  487 + android:layout_width="0dp"
  488 + android:layout_height="wrap_content"
  489 + android:layout_weight="2"
  490 + android:text="我的错题"
  491 + android:textSize="20sp" />
  492 +
  493 + <TextView
  494 + android:layout_width="1dp"
  495 + android:layout_height="wrap_content"
  496 + android:layout_weight="1"
  497 + android:text="我的错题"
  498 + android:textSize="20sp" />
  499 +
  500 + <TextView
  501 + android:layout_width="0dp"
  502 + android:layout_height="wrap_content"
  503 + android:layout_weight="2"
  504 + android:text="我的错题"
  505 + android:textSize="20sp" />
  506 + </LinearLayout>
  507 +
  508 + <LinearLayout
  509 + android:layout_width="match_parent"
  510 + android:layout_height="wrap_content"
  511 + android:layout_marginTop="20dp"
  512 + android:gravity="center_vertical"
  513 + android:orientation="horizontal">
  514 +
  515 + <TextView
  516 + android:layout_width="0dp"
  517 + android:layout_height="wrap_content"
  518 + android:layout_weight="1"
  519 + android:text="我的错题"
  520 + android:textSize="20sp" />
  521 +
  522 + <TextView
  523 + android:layout_width="0dp"
  524 + android:layout_height="wrap_content"
  525 + android:layout_weight="2"
  526 + android:text="我的错题"
  527 + android:textSize="20sp" />
  528 +
  529 + <TextView
  530 + android:layout_width="1dp"
  531 + android:layout_height="wrap_content"
  532 + android:layout_weight="1"
  533 + android:text="我的错题"
  534 + android:textSize="20sp" />
  535 +
  536 + <TextView
  537 + android:layout_width="0dp"
  538 + android:layout_height="wrap_content"
  539 + android:layout_weight="2"
  540 + android:text="我的错题"
  541 + android:textSize="20sp" />
  542 + </LinearLayout>
  543 +
  544 +
  545 + </LinearLayout>
  546 +
  547 + <LinearLayout
  548 + android:layout_width="match_parent"
  549 + android:layout_height="wrap_content"
  550 + android:layout_margin="20dp"
  551 + android:gravity="center_vertical"
  552 + android:orientation="horizontal">
  553 +
  554 + <View
  555 + android:layout_width="5dp"
  556 + android:layout_height="20dp"
  557 + android:background="@color/login_text_blue">
  558 +
  559 + </View>
  560 +
  561 + <TextView
  562 + android:layout_width="wrap_content"
  563 + android:layout_height="wrap_content"
  564 + android:layout_marginLeft="5dp"
  565 + android:text="版本信息"
  566 + android:textSize="22sp" />
  567 +
  568 + </LinearLayout>
  569 +
  570 + <View
  571 + android:layout_width="match_parent"
  572 + android:layout_height="0.7dp"
  573 + android:background="@color/cutoff_line">
  574 +
  575 + </View>
  576 +
  577 + <LinearLayout
  578 + android:layout_width="match_parent"
  579 + android:layout_height="wrap_content"
  580 + android:layout_marginTop="20dp">
  581 +
  582 + <TextView
  583 + android:layout_width="match_parent"
  584 + android:layout_height="100dp"
  585 + android:layout_marginLeft="20dp"
  586 + android:layout_marginTop="10dp"
  587 + android:gravity="center"
  588 + android:text="这里需要显示水平滑动的" />
  589 + </LinearLayout>
  590 +
  591 +
  592 + </LinearLayout>
  593 +
  594 +
  595 + </LinearLayout>
  596 +
  597 +
  598 +</LinearLayout>
... ...
PersonalCenter/app/src/main/res/layout/activity_ok_cardinfo.xml
Diff comments   View file @a1f628a
... ... @@ -347,7 +347,7 @@
347 347 android:textSize="23sp" />
348 348  
349 349 <Button
350   - android:id="@+id/btn_ok"
  350 + android:id="@+id/btn_finish"
351 351 android:layout_width="300dp"
352 352 android:layout_height="wrap_content"
353 353 android:layout_marginLeft="50dp"
... ...
PersonalCenter/app/src/main/res/layout/activity_start_page.xml
Diff comments   View file @a1f628a
... ... @@ -11,7 +11,7 @@
11 11 android:paddingLeft="250dp"
12 12 android:paddingRight="250dp">
13 13 <Button
14   - android:id="@+id/btn_ok"
  14 + android:id="@+id/btn_start"
15 15 style="@style/button_login_register_style"
16 16 android:layout_marginBottom="50dp"
17 17 android:text="@string/string_start_page" />
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,386 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:id="@+id/card_view"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:orientation="vertical">
  7 +
  8 +
  9 + <LinearLayout
  10 + android:layout_width="wrap_content"
  11 + android:layout_height="wrap_content"
  12 + android:layout_marginTop="60dp"
  13 + android:orientation="horizontal">
  14 +
  15 + <View
  16 + android:layout_width="450dp"
  17 + android:layout_height="0.7dp"
  18 + android:layout_marginLeft="150dp"
  19 + android:background="@color/electronic_text">
  20 +
  21 + </View>
  22 +
  23 + <View
  24 + android:layout_width="450dp"
  25 + android:layout_height="0.7dp"
  26 + android:layout_marginLeft="80dp"
  27 + android:background="@color/electronic_text">
  28 +
  29 + </View>
  30 +
  31 +
  32 + </LinearLayout>
  33 +
  34 + <LinearLayout
  35 + android:layout_width="match_parent"
  36 + android:layout_height="wrap_content"
  37 + android:layout_marginLeft="200dp"
  38 + android:gravity="center_vertical"
  39 + android:orientation="horizontal">
  40 +
  41 + <LinearLayout
  42 + android:layout_width="0dp"
  43 + android:layout_height="80dp"
  44 + android:layout_weight="1"
  45 + android:gravity="center_vertical">
  46 +
  47 + <TextView
  48 + android:layout_width="wrap_content"
  49 + android:layout_height="wrap_content"
  50 + android:text="昵称"
  51 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  52 + android:textSize="22sp" />
  53 +
  54 + <EditText
  55 + android:layout_width="wrap_content"
  56 + android:layout_height="wrap_content"
  57 + android:layout_marginLeft="50dp"
  58 + android:background="@null"
  59 + android:hint="请输入12个以内的中文或英文字符"
  60 + android:textColor="@color/electronic_text"
  61 + android:textSize="22sp" />
  62 +
  63 + </LinearLayout>
  64 +
  65 + <LinearLayout
  66 + android:layout_width="0dp"
  67 + android:layout_height="80dp"
  68 + android:layout_weight="1"
  69 + android:gravity="center_vertical">
  70 +
  71 + <TextView
  72 + android:layout_width="wrap_content"
  73 + android:layout_height="wrap_content"
  74 + android:text="地区"
  75 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  76 + android:textSize="22sp" />
  77 +
  78 + <TextView
  79 + android:layout_width="wrap_content"
  80 + android:layout_height="wrap_content"
  81 + android:layout_marginLeft="50dp"
  82 + android:text="请选择"
  83 + android:textColor="@color/btn_text_color"
  84 + android:textSize="22sp" />
  85 +
  86 + <ImageView
  87 + android:layout_width="wrap_content"
  88 + android:layout_height="wrap_content"
  89 + android:layout_marginLeft="150dp"
  90 + android:src="@mipmap/xiajiantou">
  91 +
  92 + </ImageView>
  93 + </LinearLayout>
  94 +
  95 + </LinearLayout>
  96 +
  97 + <LinearLayout
  98 + android:layout_width="wrap_content"
  99 + android:layout_height="wrap_content"
  100 + android:orientation="horizontal">
  101 +
  102 + <View
  103 + android:layout_width="450dp"
  104 + android:layout_height="0.7dp"
  105 + android:layout_marginLeft="150dp"
  106 + android:background="@color/electronic_text">
  107 +
  108 + </View>
  109 +
  110 + <View
  111 + android:layout_width="450dp"
  112 + android:layout_height="0.7dp"
  113 + android:layout_marginLeft="80dp"
  114 + android:background="@color/electronic_text">
  115 +
  116 + </View>
  117 +
  118 +
  119 + </LinearLayout>
  120 +
  121 + <LinearLayout
  122 + android:layout_width="match_parent"
  123 + android:layout_height="wrap_content"
  124 + android:layout_marginLeft="200dp"
  125 + android:gravity="center_vertical"
  126 + android:orientation="horizontal">
  127 +
  128 + <LinearLayout
  129 + android:layout_width="0dp"
  130 + android:layout_height="80dp"
  131 + android:layout_weight="1"
  132 + android:gravity="center_vertical">
  133 +
  134 + <TextView
  135 + android:layout_width="wrap_content"
  136 + android:layout_height="wrap_content"
  137 + android:text="性别"
  138 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  139 + android:textSize="22sp" />
  140 +
  141 + <TextView
  142 + android:layout_width="wrap_content"
  143 + android:layout_height="wrap_content"
  144 + android:layout_marginLeft="50dp"
  145 + android:text="请选择"
  146 + android:textSize="22sp" />
  147 +
  148 + <ImageView
  149 + android:layout_width="wrap_content"
  150 + android:layout_height="wrap_content"
  151 + android:layout_marginLeft="150dp"
  152 + android:src="@mipmap/xiajiantou">
  153 +
  154 + </ImageView>
  155 +
  156 +
  157 + </LinearLayout>
  158 +
  159 + <LinearLayout
  160 + android:layout_width="0dp"
  161 + android:layout_height="80dp"
  162 + android:layout_weight="1"
  163 + android:gravity="center_vertical">
  164 +
  165 + <TextView
  166 + android:layout_width="wrap_content"
  167 + android:layout_height="wrap_content"
  168 + android:text=" "
  169 + android:textColor="@color/white"
  170 + android:textSize="22sp" />
  171 +
  172 + <EditText
  173 + android:layout_width="wrap_content"
  174 + android:layout_height="wrap_content"
  175 + android:layout_marginLeft="50dp"
  176 + android:background="@null"
  177 + android:hint="请输入详细地址"
  178 + android:textSize="22sp" />
  179 +
  180 + </LinearLayout>
  181 +
  182 + </LinearLayout>
  183 +
  184 + <LinearLayout
  185 + android:layout_width="wrap_content"
  186 + android:layout_height="wrap_content"
  187 +
  188 + android:orientation="horizontal">
  189 +
  190 + <View
  191 + android:layout_width="450dp"
  192 + android:layout_height="0.7dp"
  193 + android:layout_marginLeft="150dp"
  194 + android:background="@color/electronic_text">
  195 +
  196 + </View>
  197 +
  198 + <View
  199 + android:layout_width="450dp"
  200 + android:layout_height="0.7dp"
  201 + android:layout_marginLeft="80dp"
  202 + android:background="@color/electronic_text">
  203 +
  204 + </View>
  205 +
  206 +
  207 + </LinearLayout>
  208 +
  209 + <LinearLayout
  210 + android:layout_width="match_parent"
  211 + android:layout_height="wrap_content"
  212 + android:layout_marginLeft="200dp"
  213 + android:gravity="center_vertical"
  214 + android:orientation="horizontal">
  215 +
  216 +
  217 + <LinearLayout
  218 + android:layout_width="0dp"
  219 + android:layout_height="80dp"
  220 + android:layout_weight="1"
  221 + android:gravity="center_vertical">
  222 +
  223 + <TextView
  224 + android:layout_width="wrap_content"
  225 + android:layout_height="wrap_content"
  226 + android:text="生日"
  227 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  228 + android:textSize="22sp" />
  229 +
  230 + <TextView
  231 + android:layout_width="wrap_content"
  232 + android:layout_height="wrap_content"
  233 + android:layout_marginLeft="50dp"
  234 + android:hint="请选择"
  235 + android:textSize="22sp" />
  236 +
  237 + <ImageView
  238 + android:layout_width="wrap_content"
  239 + android:layout_height="wrap_content"
  240 + android:layout_marginLeft="150dp"
  241 + android:src="@mipmap/xiajiantou"/>
  242 + </LinearLayout>
  243 + <LinearLayout
  244 + android:layout_width="0dp"
  245 + android:layout_height="80dp"
  246 + android:layout_weight="1"
  247 + android:gravity="center_vertical">
  248 +
  249 + <TextView
  250 + android:layout_width="wrap_content"
  251 + android:layout_height="wrap_content"
  252 + android:text="年级"
  253 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  254 + android:textSize="22sp" />
  255 +
  256 + <TextView
  257 + android:layout_width="wrap_content"
  258 + android:layout_height="wrap_content"
  259 + android:layout_marginLeft="50dp"
  260 + android:hint="请选择"
  261 + android:textSize="22sp" />
  262 +
  263 + <ImageView
  264 + android:layout_width="wrap_content"
  265 + android:layout_height="wrap_content"
  266 + android:layout_marginLeft="150dp"
  267 + android:src="@mipmap/xiajiantou"/>
  268 + </LinearLayout>
  269 +
  270 + </LinearLayout>
  271 +
  272 + <LinearLayout
  273 + android:layout_width="wrap_content"
  274 + android:layout_height="wrap_content"
  275 +
  276 + android:orientation="horizontal">
  277 +
  278 + <View
  279 + android:layout_width="450dp"
  280 + android:layout_height="0.7dp"
  281 + android:layout_marginLeft="150dp"
  282 + android:background="@color/electronic_text">
  283 +
  284 + </View>
  285 +
  286 + <View
  287 + android:layout_width="450dp"
  288 + android:layout_height="0.7dp"
  289 + android:layout_marginLeft="80dp"
  290 + android:background="@color/electronic_text">
  291 +
  292 + </View>
  293 +
  294 +
  295 + </LinearLayout>
  296 +
  297 + <LinearLayout
  298 + android:layout_width="match_parent"
  299 + android:layout_height="wrap_content"
  300 + android:layout_marginLeft="200dp"
  301 + android:gravity="center_vertical"
  302 + android:orientation="horizontal">
  303 +
  304 + <LinearLayout
  305 + android:id="@+id/lineL_buy_time"
  306 + android:layout_width="0dp"
  307 + android:layout_height="80dp"
  308 + android:layout_weight="1"
  309 + android:gravity="center_vertical">
  310 +
  311 + <TextView
  312 + android:layout_width="wrap_content"
  313 + android:layout_height="wrap_content"
  314 + android:text="Q Q"
  315 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  316 + android:textSize="22sp" />
  317 +
  318 + <EditText
  319 + android:id="@+id/tv_buy_time"
  320 + android:layout_width="wrap_content"
  321 + android:layout_height="wrap_content"
  322 + android:layout_marginLeft="50dp"
  323 + android:background="@null"
  324 + android:hint="请输入"
  325 + android:textSize="22sp" />
  326 +
  327 + </LinearLayout>
  328 +
  329 + <LinearLayout
  330 + android:layout_width="0dp"
  331 + android:layout_height="80dp"
  332 + android:layout_weight="1"
  333 +
  334 + android:gravity="center_vertical">
  335 +
  336 + <TextView
  337 + android:layout_width="wrap_content"
  338 + android:layout_height="wrap_content"
  339 + android:text="学校"
  340 + android:textColor="@color/pickerview_wheelview_textcolor_center"
  341 + android:textSize="22sp" />
  342 +
  343 + <TextView
  344 + android:layout_width="wrap_content"
  345 + android:layout_height="wrap_content"
  346 + android:layout_marginLeft="50dp"
  347 + android:text="请选择"
  348 + android:textColor="@color/btn_text_color"
  349 + android:textSize="22sp" />
  350 +
  351 + <ImageView
  352 + android:layout_width="wrap_content"
  353 + android:layout_height="wrap_content"
  354 + android:layout_marginLeft="150dp"
  355 + android:src="@mipmap/xiajiantou">
  356 +
  357 + </ImageView>
  358 + </LinearLayout>
  359 +
  360 + </LinearLayout>
  361 +
  362 + <LinearLayout
  363 + android:layout_width="wrap_content"
  364 + android:layout_height="wrap_content"
  365 + android:orientation="horizontal">
  366 +
  367 + <View
  368 + android:layout_width="450dp"
  369 + android:layout_height="0.7dp"
  370 + android:layout_marginLeft="150dp"
  371 + android:background="@color/electronic_text">
  372 +
  373 + </View>
  374 +
  375 + <View
  376 + android:layout_width="450dp"
  377 + android:layout_height="0.7dp"
  378 + android:layout_marginLeft="80dp"
  379 + android:background="@color/electronic_text">
  380 +
  381 + </View>
  382 +
  383 +
  384 + </LinearLayout>
  385 +
  386 +</LinearLayout>
0 387 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,16 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:orientation="vertical" android:layout_width="match_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="@color/white">
  6 + <GridView
  7 + android:id="@+id/grideview"
  8 + android:layout_marginTop="20dp"
  9 + android:layout_width="match_parent"
  10 + android:layout_height="wrap_content"
  11 + android:layout_below="@+id/title"
  12 + android:numColumns="5">
  13 +
  14 + </GridView>
  15 +
  16 +</RelativeLayout>
0 17 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,36 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:orientation="vertical"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:gravity="center">
  7 +
  8 +
  9 + <ImageView
  10 + android:src="@mipmap/ic_launcher"
  11 + android:id="@+id/image"
  12 + android:layout_width="100dp"
  13 + android:background="@drawable/corcle_black_bg"
  14 + android:layout_height="150dp"
  15 +
  16 + />
  17 + <TextView
  18 + android:id="@+id/text"
  19 + android:layout_marginTop="5dp"
  20 + android:textSize="22sp"
  21 + android:layout_width="wrap_content"
  22 + android:layout_height="wrap_content"
  23 + android:textColor="@color/login_text_black"
  24 + android:text="语文"
  25 + />
  26 + <TextView
  27 + android:id="@+id/tv_publish"
  28 + android:layout_marginTop="10dp"
  29 + android:textSize="18sp"
  30 + android:layout_width="wrap_content"
  31 + android:layout_height="wrap_content"
  32 + android:textColor="@color/login_text_black"
  33 + android:text="人民教育出版社"
  34 + />
  35 +
  36 +</LinearLayout>
0 37 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/mipmap-xhdpi/card_icoc.png
Diff comments   View file @a1f628a

234 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/fankui.png
Diff comments   View file @a1f628a

836 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/header_default.png
Diff comments   View file @a1f628a

4.79 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/men.png
Diff comments   View file @a1f628a

680 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/pencil.png
Diff comments   View file @a1f628a

423 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/pifu.png
Diff comments   View file @a1f628a

1.08 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/shezhi.png
Diff comments   View file @a1f628a

909 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/wodebanji.png
Diff comments   View file @a1f628a

480 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/wodebiji.png
Diff comments   View file @a1f628a

588 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/wodecuoti.png
Diff comments   View file @a1f628a

371 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/wodeshoucang.png
Diff comments   View file @a1f628a

730 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/women.png
Diff comments   View file @a1f628a

618 Bytes
PersonalCenter/app/src/main/res/mipmap-xhdpi/xiaoguanggao.png
Diff comments   View file @a1f628a

19.1 KB
PersonalCenter/app/src/main/res/mipmap-xhdpi/youjiantou.png
Diff comments   View file @a1f628a

457 Bytes
PersonalCenter/app/src/main/res/values/strings.xml
Diff comments   View file @a1f628a
... ... @@ -18,6 +18,8 @@
18 18 <string name="string_start_page">开始学习体验</string>
19 19 <string name="bangding">绑定家长控制</string>
20 20 <string name="finish">完成</string>
  21 + <string name="account_management">账户管理</string>
  22 + <string name="changge_preson">修改个人信息</string>
21 23  
22 24 //电子保卡
23 25 <string name="string_electroniccard_info_title">填写保卡信息</string>
... ... @@ -39,5 +41,9 @@
39 41 <string name="hint">留下您的联系方式，方便与您沟通。</string>
40 42  
41 43  
  44 + //个人中心
  45 + <string name="titel_preson">个人中心</string>
  46 +
  47 +
42 48  
43 49 </resources>
... ...
PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/OptionsPickerView.java
Diff comments   View file @a1f628a
... ... @@ -418,8 +418,8 @@ public class OptionsPickerView&lt;T&gt; extends BasePickerView implements View.OnClick
418 418 tvTitle.setText(TextUtils.isEmpty(Str_Title) ? "" : Str_Title);//默认为空
419 419  
420 420 //设置color
421   - btnSubmit.setTextColor(Color_Submit == 0 ? pickerview_timebtn_nor : Color_Submit);
422   - btnCancel.setTextColor(Color_Cancel == 0 ? pickerview_timebtn_nor : Color_Cancel);
  421 +// btnSubmit.setTextColor(Color_Submit == 0 ? pickerview_timebtn_nor : Color_Submit);
  422 +// btnCancel.setTextColor(Color_Cancel == 0 ? pickerview_timebtn_nor : Color_Cancel);
423 423 tvTitle.setTextColor(Color_Title == 0 ? pickerview_topbar_title : Color_Title);
424 424 rv_top_bar.setBackgroundColor(Color_Background_Title == 0 ? pickerview_bg_topbar : Color_Background_Title);
425 425  
... ...
PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/TimePickerView.java
Diff comments   View file @a1f628a
... ... @@ -161,7 +161,7 @@ public class TimePickerView extends BasePickerView implements View.OnClickListen
161 161 private int backgroundId; //显示时的外部背景色颜色,默认是灰色
162 162 private WheelView.DividerType dividerType;//分隔线类型
163 163 // 条目间距倍数 默认1.6
164   - private float lineSpacingMultiplier = 1.6F;
  164 + private float lineSpacingMultiplier = 1.8F;
165 165  
166 166 private boolean isDialog;//是否是对话框模式
167 167  
... ...
PersonalCenter/pickerview/src/main/java/com/bigkoo/pickerview/view/BasePickerView.java
Diff comments   View file @a1f628a
... ... @@ -104,6 +104,7 @@ public class BasePickerView {
104 104 contentContainer = (ViewGroup) rootView.findViewById(R.id.content_container);
105 105 params.leftMargin = 500;
106 106 params.rightMargin= 500;
  107 + params.height=600;
107 108 contentContainer.setLayoutParams(params);
108 109 }
109 110 setKeyBackCancelable(true);
... ...
PersonalCenter/pickerview/src/main/res/layout/include_pickerview_topbar.xml
Diff comments   View file @a1f628a
... ... @@ -13,22 +13,11 @@
13 13 android:paddingLeft="@dimen/pickerview_topbar_padding"
14 14 android:text="@string/pickerview_cancel"
15 15 android:layout_marginLeft="20dp"
16   - android:textColor="@drawable/selector_pickerview_btn"
  16 + android:textColor="@color/pickerview_wheelview_textcolor_out"
17 17 android:textSize="@dimen/pickerview_topbar_btn_textsize" />
18 18  
19   - <TextView
20   - android:id="@+id/tvTitle"
21   - android:layout_width="match_parent"
22   - android:gravity="center"
23   - android:layout_height="wrap_content"
24   - android:layout_centerVertical="true"
25   - android:layout_toLeftOf="@+id/btnSubmit"
26   - android:layout_toRightOf="@+id/btnCancel"
27   - android:textColor="@color/pickerview_topbar_title"
28   - android:textSize="@dimen/pickerview_topbar_title_textsize" />
29   -
30 19 <Button
31   - android:id="@id/btnSubmit"
  20 + android:id="@+id/btnSubmit"
32 21 android:layout_width="wrap_content"
33 22 android:layout_height="match_parent"
34 23 android:layout_alignParentRight="true"
... ... @@ -37,6 +26,6 @@
37 26 android:paddingRight="@dimen/pickerview_topbar_padding"
38 27 android:text="@string/pickerview_submit"
39 28 android:layout_marginRight="20dp"
40   - android:textColor="@drawable/selector_pickerview_btn"
  29 + android:textColor="@color/pickerview_wheelview_textcolor_out"
41 30 android:textSize="@dimen/pickerview_topbar_btn_textsize" />
42 31 </RelativeLayout>
... ...
PersonalCenter/pickerview/src/main/res/layout/pickerview_time.xml
Diff comments   View file @a1f628a
... ... @@ -4,13 +4,18 @@
4 4 android:layout_height="wrap_content"
5 5 android:orientation="vertical">
6 6  
7   -
  7 + <include
  8 + layout="@layout/pickerviw_title"
  9 + android:layout_width="match_parent"
  10 + android:layout_height="@dimen/pickerview_topbar_height" />
8 11 <LinearLayout
9 12 android:id="@+id/timepicker"
10 13 android:layout_width="wrap_content"
11 14 android:layout_height="wrap_content"
  15 + android:layout_marginTop="20dp"
12 16 android:orientation="horizontal">
13 17  
  18 +
14 19 <com.bigkoo.pickerview.lib.WheelView
15 20 android:id="@+id/year"
16 21 android:layout_width="match_parent"
... ...
PersonalCenter/pickerview/src/main/res/layout/pickerviw_title.xml
Diff comments   View file @a1f628a
... ... @@ -0,0 +1,14 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:orientation="vertical"
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent">
  6 + <TextView
  7 + android:id="@+id/tvTitle"
  8 + android:layout_width="match_parent"
  9 + android:gravity="center"
  10 + android:layout_height="wrap_content"
  11 + android:textColor="@color/pickerview_topbar_title"
  12 + android:textSize="22sp" />
  13 +
  14 +</LinearLayout>
0 15 \ No newline at end of file
... ...
PersonalCenter/pickerview/src/main/res/values/colors.xml
Diff comments   View file @a1f628a
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <resources>
3   - <color name="pickerview_timebtn_nor">#057dff</color>
  3 + <color name="pickerview_timebtn_nor">#afafaf</color>
4 4 <color name="pickerview_timebtn_pre">#c2daf5</color>
5 5 <color name="pickerview_bg_topbar">#f5f5f5</color>
6 6 <color name="white">#ffffffff</color>
... ...