diff --git a/PersonalCenter/.idea/modules.xml b/PersonalCenter/.idea/modules.xml index cae0244..753efba 100644 --- a/PersonalCenter/.idea/modules.xml +++ b/PersonalCenter/.idea/modules.xml @@ -6,7 +6,6 @@ - \ No newline at end of file diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml index 93b13b4..1d5e49a 100644 --- a/PersonalCenter/app/src/main/AndroidManifest.xml +++ b/PersonalCenter/app/src/main/AndroidManifest.xml @@ -102,6 +102,18 @@ android:screenOrientation="landscape"> + + + + + + \ No newline at end of file diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java new file mode 100644 index 0000000..b5ac741 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java @@ -0,0 +1,18 @@ +package com.hjx.personalcenter.activity; + +import android.app.Activity; +import android.os.Bundle; + +import com.hjx.personalcenter.R; + +/**账户管理 熊巍 + * Created by h on 2017/8/12. + */ + +public class AccountManagementActivity extends Activity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_account_management); + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java index 324ed3c..792561f 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardInfoActivity.java @@ -13,6 +13,6 @@ public class ChangeElectronicCardInfoActivity extends Activity{ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_change_card_info); + setContentView(R.layout.activity_change_card_validation); } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java new file mode 100644 index 0000000..e93ac3b --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java @@ -0,0 +1,68 @@ +package com.hjx.personalcenter.activity; + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.view.ViewPager; +import android.support.v7.app.AppCompatActivity; + +import com.hjx.personalcenter.R; +import com.hjx.personalcenter.adapter.LoginAndRegisterAdapter; +import com.hjx.personalcenter.fragment.PresonInfoFragment; +import com.hjx.personalcenter.fragment.VersionsInfoFragment; +import com.hjx.personalcenter.thirdparty.SlidingTabLayout; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Created by h on 2017/8/12. + */ + +public class ChangePresonalInfoActivity extends AppCompatActivity { + private ViewPager viewPager; + private SlidingTabLayout tableLayout; + private List presoninfo; + private LoginAndRegisterAdapter presoninfodapter; + private List title = Arrays.asList("个人信息", "版本信息"); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_change_preson_info); + initView(); + initData(); + setLister(); + + } + private void initView() { + viewPager = (ViewPager) findViewById(R.id.viewpager_login); + tableLayout = (SlidingTabLayout) findViewById(R.id.TabLayout_id); + } + + private void initData() { + presoninfo = new ArrayList<>(); + for (int i = 0; i < title.size(); i++) { + if (title.get(i).equals("个人信息")) { + presoninfo.add(PresonInfoFragment.newInstance(i + 1)); + } else { + presoninfo.add(VersionsInfoFragment.newInstance(i + 1)); + } + } + + + //设置Tab上的标题 + tableLayout.setData(title); + //设置关联的ViewPager + tableLayout.setViewPager(viewPager, 0); + presoninfodapter = new LoginAndRegisterAdapter(presoninfo, getSupportFragmentManager()); + //给ViewPager设置适配器 + viewPager.setAdapter(presoninfodapter); + //设置滑动时数据不丢失 + viewPager.setOffscreenPageLimit(1); + //将TabLayout和ViewPager关联起来。 + } + + private void setLister() { + } + +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java index c2bc9cf..c37c742 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java @@ -1,11 +1,10 @@ package com.hjx.personalcenter.activity; import android.app.Activity; +import android.content.Intent; import android.graphics.Color; import android.os.Bundle; -import android.view.Gravity; import android.view.View; -import android.view.ViewGroup; import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; @@ -25,6 +24,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC private LinearLayout lineL_buy_time; private TextView tv_buy_time; private TimePickerView pvTime; + private Button btn_change_info; @Override protected void onCreate(Bundle savedInstanceState) { @@ -39,6 +39,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC private void initView() { lineL_buy_time = (LinearLayout) findViewById(R.id.lineL_buy_time); tv_buy_time = (TextView) findViewById(R.id.tv_buy_time); + btn_change_info = (Button) findViewById(R.id.btn_change_info); } private void initData() { @@ -47,6 +48,7 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC private void initLister() { lineL_buy_time.setOnClickListener(this); + btn_change_info.setOnClickListener(this); } private void initTimePicker() { @@ -77,6 +79,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC .setRangDate(startDate, endDate) .setBackgroundId(0x80000000) //设置外部遮罩颜色 .setDecorView(null) + .setTitleText("购买日期") + .setTitleSize(22) + .setCancelColor(Color.GRAY) + .setSubCalSize(22) + .setDividerColor(Color.GRAY) + .setSubmitColor(Color.GRAY) .build(); } private String getTime(Date date) {//可根据需要自行截取数据显示 @@ -90,6 +98,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC case R.id.lineL_buy_time: pvTime.show(tv_buy_time);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view break; + case R.id.btn_change_info: + Intent intent = new Intent(); + intent.setClass(ElectronicCardEditInfoActivity.this,ElectronicCardInfoOKActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + break; } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java index 46c85d4..f5b8af5 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java @@ -1,18 +1,48 @@ package com.hjx.personalcenter.activity; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import com.hjx.personalcenter.R; -/** +/**确认保卡信息 * Created by h on 2017/8/11. */ -public class ElectronicCardInfoOKActivity extends Activity{ +public class ElectronicCardInfoOKActivity extends Activity implements View.OnClickListener { + private Button btn_finish; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_ok_cardinfo); + initView(); + initData(); + initLister(); + } + private void initView() { + btn_finish = (Button) findViewById(R.id.btn_finish); + } + + private void initData() { + + } + + private void initLister() { + btn_finish.setOnClickListener(this); + } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.btn_finish: + Intent intent = new Intent(); + intent.setClass(ElectronicCardInfoOKActivity.this,TheStartPageActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + break; + } } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java index a7655fb..5a8d622 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java @@ -1,7 +1,10 @@ package com.hjx.personalcenter.activity; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import com.hjx.personalcenter.R; @@ -9,10 +12,39 @@ import com.hjx.personalcenter.R; * Created by h on 2017/8/9. */ -public class ElectronicCardValidationActivity extends Activity { +public class ElectronicCardValidationActivity extends Activity implements View.OnClickListener { + private Button btn_card_valiyanzhen; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_electroniccard_validation); + initView(); + initData(); + initLister(); + } + + private void initView() { + btn_card_valiyanzhen = (Button) findViewById(R.id.btn_card_valiyanzhen); + } + + private void initData() { + + } + + private void initLister() { + btn_card_valiyanzhen.setOnClickListener(this); + + } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.btn_card_valiyanzhen: + Intent intent = new Intent(); + intent.setClass(ElectronicCardValidationActivity.this,ElectronicCardEditInfoActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + break; + } } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java index 776fb37..e7879a9 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java @@ -1,26 +1,46 @@ package com.hjx.personalcenter.activity; import android.content.Intent; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; -import android.widget.TextView; +import android.widget.ImageView; import com.hjx.personalcenter.R; -public class MainActivity extends AppCompatActivity { - TextView ssss; +public class MainActivity extends AppCompatActivity implements View.OnClickListener { + ImageView iv_imformatioan; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - ssss = (TextView) findViewById(R.id.ssss); - ssss.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(MainActivity.this,ElectronicCardEditInfoActivity.class); + initView(); + initData(); + initLister(); + } + + private void initView() { + iv_imformatioan = (ImageView) findViewById(R.id.iv_imformatioan); + } + + private void initData() { + + } + + private void initLister() { + iv_imformatioan.setOnClickListener(this); + } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.iv_imformatioan: + Intent intent = new Intent(); + intent.setClass(MainActivity.this,LoginAndRegisterActivity.class); startActivity(intent); - } - }); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + break; + } + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java index 800b898..bc42902 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java @@ -1,7 +1,10 @@ package com.hjx.personalcenter.activity; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; import com.hjx.personalcenter.R; @@ -9,10 +12,37 @@ import com.hjx.personalcenter.R; * Created by h on 2017/8/10. */ -public class TheStartPageActivity extends Activity{ +public class TheStartPageActivity extends Activity implements View.OnClickListener { + private Button btn_start; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_start_page); + initView(); + initData(); + initLister(); + } + private void initView() { + btn_start = (Button) findViewById(R.id.btn_start); + } + + private void initData() { + + } + + private void initLister() { + btn_start.setOnClickListener(this); + } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.btn_start: + Intent intent = new Intent(); + intent.setClass(TheStartPageActivity.this,MainActivity.class); + startActivity(intent); + overridePendingTransition(R.anim.rightin, R.anim.rightout); + break; + } } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java index 55fb526..520c213 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/ElectronicCardDialog.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import com.hjx.personalcenter.R; -import com.hjx.personalcenter.activity.TheStartPageActivity; +import com.hjx.personalcenter.activity.ElectronicCardValidationActivity; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; @@ -39,8 +39,13 @@ public class ElectronicCardDialog extends BaseCircleDialog { getView().findViewById(R.id.fill_card).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + //有保卡信息直接进入开始界面，没有则跳转保卡信息 +// Intent intent = new Intent(); +// intent.setClass(getActivity(),TheStartPageActivity.class); +// startActivity(intent); +// getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); Intent intent = new Intent(); - intent.setClass(getActivity(),TheStartPageActivity.class); + intent.setClass(getActivity(),ElectronicCardValidationActivity.class); startActivity(intent); getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java index b5141b6..8eb0baa 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/LoginFragment.java @@ -7,10 +7,12 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.activity.ForgotPasswordActivity; +import com.hjx.personalcenter.activity.MainActivity; /** * 登录 @@ -21,8 +23,9 @@ public class LoginFragment extends Fragment implements View.OnClickListener { private View mView; private int type; private TextView tv_forget_pwd; + private Button btn_login; public static String TABLAYOUT_FRAGMENT = "tab_fragment"; - + Intent intent = new Intent(); public static LoginFragment newInstance(int type) { LoginFragment fragment = new LoginFragment(); Bundle bundle = new Bundle(); @@ -47,12 +50,14 @@ public class LoginFragment extends Fragment implements View.OnClickListener { //初始化 private void initView(View mView) { tv_forget_pwd = (TextView) mView.findViewById(R.id.tv_forget_pwd); + btn_login = (Button) mView.findViewById(R.id.btn_login); } private void initData() { } private void setLister() { tv_forget_pwd.setOnClickListener(this); + btn_login.setOnClickListener(this); } @@ -60,11 +65,15 @@ public class LoginFragment extends Fragment implements View.OnClickListener { public void onClick(View v) { switch (v.getId()){ case R.id.tv_forget_pwd: - Intent intent = new Intent(); intent.setClass(getActivity(),ForgotPasswordActivity.class); startActivity(intent); getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); break; + case R.id.btn_login: + intent.setClass(getActivity(),MainActivity.class); + startActivity(intent); + getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); + break; } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java new file mode 100644 index 0000000..3862d1b --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java @@ -0,0 +1,50 @@ +package com.hjx.personalcenter.fragment; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import com.hjx.personalcenter.R; + +/** + * Created by h on 2017/8/12. + */ + +public class PresonInfoFragment extends Fragment { + private View mView; + private int type; + public static String TABLAYOUT_FRAGMENT = "tab_fragment"; + + public static PresonInfoFragment newInstance(int type) { + PresonInfoFragment fragment = new PresonInfoFragment(); + Bundle bundle = new Bundle(); + bundle.putSerializable(TABLAYOUT_FRAGMENT, type); + fragment.setArguments(bundle); + return fragment; + + } + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + if (mView == null) { + mView = inflater.inflate(R.layout.fragment_changge_presonal_info, container, false); + initView(mView); + initData(); + setLister(); + + + } + return mView; + } + //初始化 + private void initView(View mView) { + + } + private void initData() { + } + private void setLister() { + } + +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java new file mode 100644 index 0000000..b408650 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java @@ -0,0 +1,89 @@ +package com.hjx.personalcenter.fragment; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.GridView; +import android.widget.SimpleAdapter; + +import com.hjx.personalcenter.R; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by h on 2017/8/12. + */ + +public class VersionsInfoFragment extends Fragment { + private GridView gridView; + private List> data_list; + private SimpleAdapter sim_adapter; + private View mView; + private int type; + public static String TABLAYOUT_FRAGMENT = "tab_fragment"; + + public static VersionsInfoFragment newInstance(int type) { + VersionsInfoFragment fragment = new VersionsInfoFragment(); + Bundle bundle = new Bundle(); + bundle.putSerializable(TABLAYOUT_FRAGMENT, type); + fragment.setArguments(bundle); + return fragment; + + } + // 图片封装为一个数组 + private int[] icon = { R.mipmap.ic_launcher, R.mipmap.ic_launcher, + R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher, + R.mipmap.ic_launcher, R.mipmap.ic_launcher, R.mipmap.ic_launcher, + R.mipmap.ic_launcher}; + private String[] subject = { "语文", "数学", "英语", "物理", "化学", "生物", "政治", + "历史", "地理" }; + private String[] publish = { "人民教育出版社", "人民教育出版社", "人民教育出版社", + "人民教育出版社", "人民教育出版社", "人民教育出版社", "人民教育出版社", + "人民教育出版社", "人民教育出版社" }; + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + if (mView == null) { + mView = inflater.inflate(R.layout.activity_choisetextbook, container, false); + initView(mView); + initData(); + setLister(); + + + } + return mView; + } + //初始化 + private void initView(View mView) { + gridView =(GridView) mView.findViewById(R.id.grideview); + + } + private void initData() { + data_list = new ArrayList>(); + getData(); + String [] from ={"image","text","text1"}; + int [] to = {R.id.image,R.id.text}; + sim_adapter = new SimpleAdapter(getActivity(), data_list, R.layout.fragment_changge_version_info_itmes, from, to); + //配置适配器 + gridView.setAdapter(sim_adapter); + } + public List> getData(){ + //cion和iconName的长度是相同的，这里任选其一都可以 + for(int i=0;i map = new HashMap(); + map.put("image", icon[i]); + map.put("text", subject[i]); + map.put("text1", publish[i]); + data_list.add(map); + } + + return data_list; + } + private void setLister() { + } +} diff --git a/PersonalCenter/app/src/main/res/layout/activity_account_management.xml b/PersonalCenter/app/src/main/res/layout/activity_account_management.xml new file mode 100644 index 0000000..6ef6167 --- /dev/null +++ b/PersonalCenter/app/src/main/res/layout/activity_account_management.xml @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PersonalCenter/app/src/main/res/layout/activity_change_card_info.xml b/PersonalCenter/app/src/main/res/layout/activity_change_card_info.xml deleted file mode 100644 index a2cc2f4..0000000 --- a/PersonalCenter/app/src/main/res/layout/activity_change_card_info.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -