diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml index fbb6828..5d19981 100644 --- a/PersonalCenter/.idea/misc.xml +++ b/PersonalCenter/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml index 980797b..2ef9362 100644 --- a/PersonalCenter/app/src/main/AndroidManifest.xml +++ b/PersonalCenter/app/src/main/AndroidManifest.xml @@ -146,5 +146,6 @@ + \ 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 index d0984e4..17d732a 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java @@ -69,6 +69,7 @@ public class AccountManagementActivity extends AppCompatActivity implements View String school = null; String addr = null; String phote = null; + String subAccountId = null; List childList = new ArrayList<>(); List list = (List) msg.obj; for (int i = 0; i < list.size(); i++) { @@ -79,6 +80,7 @@ public class AccountManagementActivity extends AppCompatActivity implements View school = list.get(i).getSchool(); addr = list.get(i).getRegion(); phote = list.get(i).getImage(); + subAccountId = list.get(i).getSubAccountId(); } else if (type == 2) { childList.add(list.get(i)); } @@ -187,6 +189,7 @@ public class AccountManagementActivity extends AppCompatActivity implements View overridePendingTransition(R.anim.rightin, R.anim.rightout); break; case R.id.add_account: + Content.accountflag =2; Intent account = new Intent(); account.setClass(AccountManagementActivity.this, RegisterInfoActivity.class); startActivity(account); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java index b06904e..fd1e5d7 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java @@ -5,13 +5,15 @@ import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.View; import android.widget.AdapterView; import android.widget.Button; import android.widget.GridView; import android.widget.ImageView; +import android.widget.TextView; +import android.widget.Toast; +import com.facebook.drawee.view.SimpleDraweeView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.adapter.GridAdapter; import com.hjx.personalcenter.customdialog.ElectronicCardDialog; @@ -19,9 +21,7 @@ import com.hjx.personalcenter.customdialog.VerSionDialog; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; -import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.model.DefautPublishInfo; -import com.hjx.personalcenter.model.VersionInfo; import com.hjx.personalcenter.util.AlertUtils; import org.json.JSONException; @@ -35,7 +35,7 @@ import java.util.List; * Created by h on 2017/8/10. */ -public class ChoiseTextBookActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemClickListener, DialogCallBack.VersionCallBack { +public class ChoiseTextBookActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemClickListener{ private GridView gridView; private Button btn_ok; private ImageView cancel; @@ -75,6 +75,36 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On defautPublishInfos.addAll( (List)msg.obj); sim_adapter.notifyDataSetChanged(); break; + case HttpCode.REGISTERINFO_SUCESS: + try { + jsonObject = new JSONObject((String) msg.obj); + String statusregister = jsonObject.optString("status"); + if (statusregister.equals("1")) { + Toast.makeText(ChoiseTextBookActivity.this, "注册信息上传成功", Toast.LENGTH_LONG).show(); + String userID = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, "userId"); + try { + if (userID == null) { + AlertUtils.showToast(ChoiseTextBookActivity.this, "连接超时请重新登录！"); + + } else { + long auserID = Long.parseLong(userID); + //验证保卡信息 + HttpManager.getInstance().cardinfocheck(ChoiseTextBookActivity.this, auserID, handler); + } + + } catch (NumberFormatException e) { + e.printStackTrace(); + } + + } else { + AlertUtils.showToast(ChoiseTextBookActivity.this, "您好，服务器异常，请稍后重试"); + } + } catch (JSONException e) { + e.printStackTrace(); + } + + + break; } @@ -85,11 +115,11 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); String userID = SaveParam.getInstance().getLoginParam(this,"userId"); - String graderid = SaveParam.getInstance().getLoginParam(this,SaveParam.GRADENS); + String graderid = SaveParam.getInstance().getCustomizeParam(this,SaveParam.GRADENS); try { long auserID = Long.parseLong(userID); int graderID = Integer.parseInt(graderid); - //获取个人信息 + //获取版本信息 HttpManager.getInstance().getpublishinfo(this,auserID,graderID,handler); } catch (NumberFormatException e) { @@ -126,16 +156,36 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On switch (v.getId()) { case R.id.btn_ok: String userID = SaveParam.getInstance().getLoginParam(this, "userId"); + String regionId = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.COUNTRY); + String regionId1 = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.CITYS); + if (regionId == null) { + regionId = regionId1; + } + String grade = SaveParam.getInstance().getCustomizeParam(ChoiseTextBookActivity.this, SaveParam.GRADENS); + String schoolid = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.SCHOOOlID); + String name = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.USERNAME); + String regeionname = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.ADRESS); + String togoth ="人民教育出版社"; + try { if (userID == null) { AlertUtils.showToast(ChoiseTextBookActivity.this, "连接超时请重新登录！"); } else { + Object schoolID; long auserID = Long.parseLong(userID); - //验证保卡信息 - HttpManager.getInstance().cardinfocheck(this, auserID, handler); + int gradeID = Integer.parseInt(grade); + long regionID = Long.parseLong(regionId); + if (schoolid==null){ + schoolID =null; + }else { + schoolID = Long.parseLong(schoolid); + } + //提交注册信息 - HttpManager.getInstance().cardinfocheck(this, auserID, handler); + HttpManager.getInstance().subregisterinfo(ChoiseTextBookActivity.this, auserID, + name ,gradeID,regionID,regeionname,schoolID,togoth,togoth,togoth,togoth + ,togoth,togoth,togoth,togoth,togoth,togoth,handler); } } catch (NumberFormatException e) { @@ -152,17 +202,15 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - SaveParam.getInstance().saveLoginParam(this,SaveParam.VERSION,defautPublishInfos.get(position).getSubject()); - VerSionDialog.getInstance(this).show(getSupportFragmentManager(), "VerSionDialog"); - - + SaveParam.getInstance().saveLoginParam(this,SaveParam.SUBJECT,defautPublishInfos.get(position).getSubject()); + VerSionDialog.getInstance().show(getSupportFragmentManager(), "VerSionDialog"); + + String imgurl = SaveParam.getInstance().getLoginParam(this, SaveParam.IMGURL); + String version = SaveParam.getInstance().getLoginParam(this, SaveParam.VERSION); + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) parent.findViewById(R.id.image_publish); + TextView publish = (TextView) parent.findViewById(R.id.tv_publish); + simpleDraweeView.setImageURI(imgurl); + publish.setText(version); } - @Override - public void versionOnItemClick(ArrayList data, int position, int type) { - - Log.e("...........",""+data); - - - } } 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 b1d58f3..e68a7b8 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 @@ -39,7 +39,7 @@ public class ElectronicCardEditInfoActivity extends AppCompatActivity implements private EditText username,store,detalAdress,telphone; private TimePickerView pvTime; private Button btn_change_info; - private ImageView iv_card_back; + private ImageView iv_card_back,shop_adress,custom_adress; @Override protected void onCreate(Bundle savedInstanceState) { @@ -61,6 +61,8 @@ public class ElectronicCardEditInfoActivity extends AppCompatActivity implements telphone = (EditText) findViewById(R.id.et_edit_telphone); btn_change_info = (Button) findViewById(R.id.btn_change_info); iv_card_back = (ImageView) findViewById(R.id.iv_card_back); + shop_adress = (ImageView) findViewById(R.id.shopdizhi); + custom_adress = (ImageView) findViewById(R.id.cunstomdizhi); } private void initData() { @@ -73,6 +75,9 @@ public class ElectronicCardEditInfoActivity extends AppCompatActivity implements adress_shop.setOnClickListener(this); adress_custem.setOnClickListener(this); btn_change_info.setOnClickListener(this); + iv_card_back.setOnClickListener(this); + shop_adress.setOnClickListener(this); + custom_adress.setOnClickListener(this); } @@ -103,11 +108,13 @@ public class ElectronicCardEditInfoActivity extends AppCompatActivity implements break; case R.id.tv_edit_adress_shop: + case R.id.shopdizhi: Content.adressflag =1; ProvinceListDialog.getInstance((DialogCallBack.ProvincesCallBack) this).show(getSupportFragmentManager(), "ProvinceListDialog"); break; case R.id.tv_edit_adress_custem: + case R.id.cunstomdizhi: Content.adressflag =2; ProvinceListDialog.getInstance((DialogCallBack.ProvincesCallBack) this).show(getSupportFragmentManager(), "ProvinceListDialog"); 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 dec12b6..1e71e09 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 @@ -29,13 +29,17 @@ import com.facebook.drawee.interfaces.DraweeController; import com.facebook.drawee.view.SimpleDraweeView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.adapter.GalleryAdapter; +import com.hjx.personalcenter.adapter.VideoAdapter; import com.hjx.personalcenter.customdialog.HeadDialog; +import com.hjx.personalcenter.customdialog.RecyclerViewSpaceItem; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.interfaces.DialogCallBack; +import com.hjx.personalcenter.model.DefautPublishInfo; import com.hjx.personalcenter.model.PesonalInfo; import com.hjx.personalcenter.model.SignInfo; +import com.hjx.personalcenter.model.VideoInfo; import com.hjx.personalcenter.update.UpdateChecker; import com.hjx.personalcenter.util.AlertUtils; import com.hjx.personalcenter.util.CropUtils; @@ -53,7 +57,6 @@ import com.zaaach.toprightmenu.TopRightMenu; import java.io.File; import java.io.UnsupportedEncodingException; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class MainActivity extends AppCompatActivity implements View.OnClickListener, DialogCallBack.CallBackView { @@ -65,9 +68,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe private TopRightMenu mTopRightMenu; //水平滑动 private RecyclerView mRecyclerView; - private GalleryAdapter RecyclerViewadapter; - private List mDatas = new ArrayList(Arrays.asList(R.mipmap.default_avatar2, - R.mipmap.default_avatar2, R.mipmap.default_avatar2, R.mipmap.default_avatar2)); + private RecyclerView mRecyclerViewpublish; + private VideoAdapter RecyclerViewadapter; + private GalleryAdapter RecyclerViewadapterpublish; + private ArrayList defautPublishInfos = new ArrayList<>(); + + private ArrayList videoinfo = new ArrayList<>(); private boolean showIcon = true; private boolean dimBg = true; private boolean needAnim = true; @@ -110,6 +116,16 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe } break; + case HttpCode.PUBLISH_SUCESS: + defautPublishInfos.clear(); + defautPublishInfos.addAll( (List)msg.obj); + RecyclerViewadapterpublish.notifyDataSetChanged(); + break; + case HttpCode.GETVIDIO_SUCESS: + videoinfo.clear(); + videoinfo.addAll( (List)msg.obj); + RecyclerViewadapter.notifyDataSetChanged(); + break; } } }; @@ -161,21 +177,32 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe linel_myclass = (LinearLayout) findViewById(R.id.linel_myclass); // mRecyclerView = (RecyclerView) findViewById(R.id.id_recyclerview_horizontal); + mRecyclerViewpublish =(RecyclerView) findViewById(R.id.id_recyclerview_pubish); } private void initData() { - //加载最近学习视频 - - //设置布局管理器 LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL); + + LinearLayoutManager linearLayoutManagerpublish = new LinearLayoutManager(this); + linearLayoutManagerpublish.setOrientation(LinearLayoutManager.HORIZONTAL); + mRecyclerView.setLayoutManager(linearLayoutManager); - //设置适配器 - RecyclerViewadapter = new GalleryAdapter(this, mDatas); + mRecyclerView.addItemDecoration(new RecyclerViewSpaceItem(10)); + + mRecyclerViewpublish.setLayoutManager(linearLayoutManagerpublish); + mRecyclerViewpublish.addItemDecoration(new RecyclerViewSpaceItem(10)); + + //设置视频适配器 + RecyclerViewadapter = new VideoAdapter(this,videoinfo); + RecyclerViewadapterpublish= new GalleryAdapter(this,defautPublishInfos); + + //版本信息适配器 mRecyclerView.setAdapter(RecyclerViewadapter); + mRecyclerViewpublish.setAdapter(RecyclerViewadapterpublish); //加载个人信息 String xiongzuo = SaveParam.getInstance().getLoginParam(this,SaveParam.CONSTELLATION); @@ -184,11 +211,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe }else { tv_mygad.setText(xiongzuo); } - //加载版本信息 - + String userID = SaveParam.getInstance().getLoginParam(this,"userId"); //获取个性签名 - String userID = SaveParam.getInstance().getLoginParam(this,"userId"); String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT); try { long auserID = Long.parseLong(userID); @@ -344,12 +369,26 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe protected void onResume() { super.onResume(); String userID = SaveParam.getInstance().getLoginParam(this,"userId"); - String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT); + String graderid = SaveParam.getInstance().getCustomizeParam(this,SaveParam.GRADENS); + //子账户年级id + String graderidchilds = SaveParam.getInstance().getCustomizeParam(this,SaveParam.CHILDSGRADENS); + //账户类型 + String accounts = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT); try { + int graderID; long auserID = Long.parseLong(userID); - int typeaccount1=Integer.parseInt(typeaccount); + int typeaccount1=Integer.parseInt(accounts); + if ("2".equals(accounts)){ + graderID = Integer.parseInt(graderidchilds); + }else { + graderID = Integer.parseInt(graderid); + } //获取个人信息 HttpManager.getInstance().getpresonalinfo(MainActivity.this,auserID,typeaccount1,handler); + //获取版本信息 + HttpManager.getInstance().getpublishinfo(this,auserID,graderID,handler); + //获取最近播放视频 + HttpManager.getInstance().getstuyvidioinfo(this,auserID,handler); } catch (NumberFormatException e) { e.printStackTrace(); @@ -559,8 +598,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe Toast.LENGTH_SHORT).show(); exitTime = System.currentTimeMillis(); } else { - finish(); - System.exit(0); + MainActivity.this.finish(); } return false; } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java index 8e8ee76..b0135ae 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java @@ -111,7 +111,7 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl String register8 = et_school.getText().toString().trim(); if (Content.accountflag == 2) { String userID = SaveParam.getInstance().getLoginParam(this, "userId"); - String grade = SaveParam.getInstance().getLoginParam(this, SaveParam.GRADENS); + String grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS); String School = SaveParam.getInstance().getLoginParam(this, SaveParam.SCHOOOlID); String regionId = SaveParam.getInstance().getLoginParam(this, SaveParam.COUNTRY); String regionId1 = SaveParam.getInstance().getLoginParam(this, SaveParam.CITYS); @@ -138,6 +138,7 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl } } else { + savedata(); Intent intent = new Intent(); intent.setClass(RegisterInfoActivity.this, ChoiseTextBookActivity.class); startActivity(intent); @@ -151,6 +152,18 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl } + private void savedata() { + String register9 = et_username.getText().toString().trim(); + String register10 = et_region.getText().toString().trim(); + String register11 = et_grade.getText().toString().trim(); + String register12 = et_school.getText().toString().trim(); + SaveParam.getInstance().saveLoginParam(this,SaveParam.USERNAME,register9); + SaveParam.getInstance().saveLoginParam(this,SaveParam.ADRESS,register10); + SaveParam.getInstance().saveLoginParam(this,SaveParam.GRADES,register11); + SaveParam.getInstance().saveLoginParam(this,SaveParam.SCHOOL,register12); + + } + @Override protected void onResume() { super.onResume(); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java index 6298903..a8b6b71 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/AccountChildsAdapter.java @@ -125,6 +125,9 @@ public class AccountChildsAdapter extends RecyclerView.Adapter { private LayoutInflater mInflater; - private List mDatas; + private ArrayList defautPublishInfo; - public GalleryAdapter(Context context, List datats) + public GalleryAdapter(Context context, ArrayList mDatas) { mInflater = LayoutInflater.from(context); - mDatas = datats; + defautPublishInfo = mDatas; } public static class ViewHolder extends RecyclerView.ViewHolder @@ -32,14 +33,16 @@ public class GalleryAdapter extends super(arg0); } - SimpleDraweeView mSimpleDraweeView; - TextView mTxt; + SimpleDraweeView simpleDraweeView; + TextView subject; + TextView publish; + } @Override public int getItemCount() { - return mDatas.size(); + return defautPublishInfo.size(); } /** @@ -48,12 +51,13 @@ public class GalleryAdapter extends @Override public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) { - View view = mInflater.inflate(R.layout.recycler_study_tem_view, + View view = mInflater.inflate(R.layout.fragment_changge_version_info_itmes2, viewGroup, false); ViewHolder viewHolder = new ViewHolder(view); - viewHolder.mSimpleDraweeView = (SimpleDraweeView) view - .findViewById(R.id.id_index_gallery_item_image); + viewHolder.simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish); + viewHolder.subject = (TextView) view.findViewById(R.id.subject); + viewHolder.publish = (TextView) view.findViewById(R.id.tv_publish); return viewHolder; } @@ -63,7 +67,9 @@ public class GalleryAdapter extends @Override public void onBindViewHolder(final ViewHolder viewHolder, final int i) { - viewHolder.mSimpleDraweeView.setImageResource(mDatas.get(i)); + viewHolder.simpleDraweeView.setImageURI(defautPublishInfo.get(i).getCover()); + viewHolder.subject.setText(defautPublishInfo.get(i).getSubject()); + viewHolder.publish.setText(defautPublishInfo.get(i).getPress()); } } \ No newline at end of file diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GridAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GridAdapter.java index 270adf8..113a0f3 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GridAdapter.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GridAdapter.java @@ -44,7 +44,7 @@ public class GridAdapter extends BaseAdapter { public View getView(int position, View convertView, ViewGroup parent) { ViewHolder viewHolder = new ViewHolder(); if (convertView == null) { - convertView = View.inflate(context, R.layout.fragment_changge_version_info_itmes, null); + convertView = View.inflate(context, R.layout.fragment_changge_version_info_itmes3, null); viewHolder.simpleDraweeView = (SimpleDraweeView) convertView.findViewById(R.id.image_publish); viewHolder.subject = (TextView) convertView.findViewById(R.id.subject); viewHolder.publish = (TextView) convertView.findViewById(R.id.tv_publish); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VideoAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VideoAdapter.java new file mode 100644 index 0000000..8be799a --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VideoAdapter.java @@ -0,0 +1,75 @@ +package com.hjx.personalcenter.adapter; + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.facebook.drawee.view.SimpleDraweeView; +import com.hjx.personalcenter.R; +import com.hjx.personalcenter.model.VideoInfo; + +import java.util.ArrayList; + +public class VideoAdapter extends + RecyclerView.Adapter +{ + + private LayoutInflater mInflater; + private ArrayList defautPublishInfo; + + public VideoAdapter(Context context, ArrayList mDatas) + { + mInflater = LayoutInflater.from(context); + defautPublishInfo = mDatas; + } + + public static class ViewHolder extends RecyclerView.ViewHolder + { + public ViewHolder(View arg0) + { + super(arg0); + } + + SimpleDraweeView simpleDraweeView; + TextView subject; + TextView publish; + + } + + @Override + public int getItemCount() + { + return defautPublishInfo.size(); + } + + /** + * 创建ViewHolder + */ + @Override + public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) + { + View view = mInflater.inflate(R.layout.fragment_changge_version_info_itmes, + viewGroup, false); + ViewHolder viewHolder = new ViewHolder(view); + + viewHolder.simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish); + viewHolder.subject = (TextView) view.findViewById(R.id.subject); + viewHolder.publish = (TextView) view.findViewById(R.id.tv_publish); + return viewHolder; + } + + /** + * 设置值 + */ + @Override + public void onBindViewHolder(final ViewHolder viewHolder, final int i) + { + viewHolder.simpleDraweeView.setImageURI(defautPublishInfo.get(i).getVideoCover()); + viewHolder.subject.setText(defautPublishInfo.get(i).getVideoName()); + //viewHolder.publish.setText(defautPublishInfo.get(i).getPress()); + } + +} \ No newline at end of file diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java index 2dba69b..206bf4f 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java @@ -89,7 +89,7 @@ public class GradeListDialog extends BaseCircleDialog implements AdapterView.OnI @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.GRADENS, ""+data.get(position).getId()); + SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.GRADENS, ""+data.get(position).getId()); mCallBack.province3OnItemClick(data,position,5); dismiss(); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java index 2da066c..3e2e494 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java @@ -94,7 +94,7 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On school_sech = (EditText) getView().findViewById(R.id.et_school_sech); cance = (ImageView) getView().findViewById(R.id.cancel); String citys = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS); - String grade = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.GRADENS); + String grade = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.GRADENS); listadapter = new SchoolAdapter(data, getActivity()); school_list.setAdapter(listadapter); school_list.setOnItemClickListener(this); diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java index 16b86b0..5d76a25 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java @@ -20,7 +20,6 @@ import com.hjx.personalcenter.adapter.VersionAdapter; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; -import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.model.VersionInfo; import com.mylhyl.circledialog.BaseCircleDialog; import com.mylhyl.circledialog.res.values.CircleDimen; @@ -39,8 +38,6 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte private ListView listView; private ArrayList data = new ArrayList<>(); - private DialogCallBack.VersionCallBack mCallBack; - Handler handler = new Handler(){ @Override public void handleMessage(Message msg) { @@ -55,12 +52,9 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte } } }; - public VerSionDialog(DialogCallBack.VersionCallBack callBack) { - this.mCallBack = callBack; - } - public static VerSionDialog getInstance(DialogCallBack.VersionCallBack callBack) { - VerSionDialog dialogFragment = new VerSionDialog(callBack); + public static VerSionDialog getInstance() { + VerSionDialog dialogFragment = new VerSionDialog(); dialogFragment.setCanceledBack(true); dialogFragment.setCanceledOnTouchOutside(true); dialogFragment.setRadius(CircleDimen.RADIUS); @@ -89,7 +83,7 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte dismiss(); } }); - String subjectName = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.VERSION); + String subjectName = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.SUBJECT); Log.e("test","选择的科目"+subjectName); HttpManager.getInstance().versioninfo(getActivity(),subjectName,handler); @@ -97,7 +91,13 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - mCallBack.versionOnItemClick(data,position,1100); + String imageurl = data.get(position).getPressCover(); + String publish = data.get(position).getPressName(); + Log.e("test","拿到的数据为"+imageurl+publish); + + SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.IMGURL,imageurl); + SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,publish); + dismiss(); } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java index a8a6f0e..819e9be 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java @@ -13,9 +13,10 @@ public class SaveParam { } return instance; } - + public static String CHILDSID = "childID";//子账号id + public static String CHILDSGRADENS = "childs";//子账号年级id public static String GRADENS = "gradens";//年级id - public static String SCHOOOlID = "schoolid";//年级id + public static String SCHOOOlID = "schoolid";//学校id //个人信息 public static String USERNAME = "usernames";//昵称 public static String ADRESS = "adress";//地址 @@ -39,7 +40,11 @@ public class SaveParam { //账户管理 public static String ACCOUNT = "account";//账户类型 - //版本信息 + //科目信息 + public static String SUBJECT = "subject"; + //图片URL + public static String IMGURL = "imgurl"; + //版本名称 public static String VERSION = "version"; 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 f2d84d2..4d23177 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 @@ -20,6 +20,7 @@ import com.hjx.personalcenter.activity.ForgotPasswordActivity; import com.hjx.personalcenter.activity.MainActivity; import com.hjx.personalcenter.activity.RegisterInfoActivity; import com.hjx.personalcenter.customdialog.ElectronicCardDialog; +import com.hjx.personalcenter.db.Content; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; @@ -104,6 +105,7 @@ public class LoginFragment extends Fragment implements View.OnClickListener { boolean isRegisterInfoComplete =isregisterinfo.optBoolean("isRegisterInfoComplete"); if (status.equals("1")){ if (!isRegisterInfoComplete){ + Content.accountflag = 1; Intent intent = new Intent(); intent.setClass(getActivity(), RegisterInfoActivity.class); getActivity().startActivity(intent); 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 index 09925fe..c2445f7 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java @@ -5,12 +5,14 @@ import android.graphics.Color; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.EditText; +import android.widget.ImageView; import android.widget.TextView; import com.bigkoo.pickerview.TimePickerView; @@ -20,6 +22,7 @@ import com.hjx.personalcenter.customdialog.CountryDialog; import com.hjx.personalcenter.customdialog.GradeListDialog; import com.hjx.personalcenter.customdialog.ProvinceListDialog; import com.hjx.personalcenter.customdialog.SchoolListDialog; +import com.hjx.personalcenter.db.Content; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.interfaces.DialogCallBack; @@ -52,7 +55,8 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener private TimePickerView pvTime; private EditText tv_username1, tv_useinfo_adress1, tv_useinfo_qq; private TextView tv_sex, tv_useinfo_adress, tv_useinfo_birthday, tv_useinfo_school, tv_useinfo_gender; - public static String TABLAYOUT_FRAGMENT = "tab_fragment"; + public static String TABLAYOUT_FRAGMENT = "presonfragment"; + private ImageView my_adress,my_sex,my_bthday,my_grade,my_school; public static PresonInfoFragment newInstance(int type) { PresonInfoFragment fragment = new PresonInfoFragment(); @@ -87,6 +91,11 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener tv_useinfo_birthday = (TextView) mView.findViewById(R.id.tv_useinfo_birthday); tv_useinfo_school = (TextView) mView.findViewById(R.id.tv_useinfo_school); tv_useinfo_gender = (TextView) mView.findViewById(R.id.tv_useinfo_gender); + my_adress = (ImageView) mView.findViewById(R.id.my_adress); + my_sex = (ImageView) mView.findViewById(R.id.my_sex); + my_bthday = (ImageView) mView.findViewById(R.id.my_bthday); + my_grade = (ImageView) mView.findViewById(R.id.my_grade); + my_school = (ImageView) mView.findViewById(R.id.my_school); } @@ -100,6 +109,11 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener tv_useinfo_birthday.setOnClickListener(this); tv_useinfo_school.setOnClickListener(this); tv_useinfo_gender.setOnClickListener(this); + my_adress.setOnClickListener(this); + my_sex.setOnClickListener(this); + my_bthday.setOnClickListener(this); + my_grade.setOnClickListener(this); + my_school.setOnClickListener(this); } @Override @@ -114,6 +128,7 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener String presonal8 = tv_useinfo_qq.getText().toString().trim(); switch (v.getId()) { case R.id.tv_sex: + case R.id.my_sex: final String[] items = {"男", "女"}; new CircleDialog.Builder(getActivity()) .configDialog(new ConfigDialog() { @@ -143,12 +158,15 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener .show(); break; case R.id.tv_useinfo_adress: + case R.id.my_adress: ProvinceListDialog.getInstance((DialogCallBack.ProvincesCallBack) PresonInfoFragment.this).show(getChildFragmentManager(), "ProvinceListDialog"); break; case R.id.tv_useinfo_birthday: + case R.id.my_bthday: pvTime.show(tv_useinfo_birthday);//弹出时间选择器，传递参数过去，回调的时候则可以绑定此view break; case R.id.tv_useinfo_school: + case R.id.my_school: if (TextUtils.isEmpty(presonal4) || TextUtils.isEmpty(presonal7)) { AlertUtils.showToast(getActivity(), "请先选择地区和年级！"); @@ -160,58 +178,62 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener break; case R.id.tv_useinfo_gender: + case R.id.my_grade: GradeListDialog.getInstance((DialogCallBack.GradeCallBack) PresonInfoFragment.this).show(getChildFragmentManager(), "GradeListDialog"); break; case R.id.presonal_sub: - if (TextUtils.isEmpty(presonal1) || - TextUtils.isEmpty(presonal2) || TextUtils.isEmpty(presonal3) || TextUtils.isEmpty(presonal4) || - TextUtils.isEmpty(presonal5) || TextUtils.isEmpty(presonal7) || - TextUtils.isEmpty(presonal8)) { - AlertUtils.showToast(getActivity(), "请将信息填写完整！"); - return; - } else { - - int a = 0, b = 0; - int d = 1; - Object schoolids; - Long f = null; - //保存星座 - BrithdayStar brithdayStar = new BrithdayStar(); - String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString()); - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.CONSTELLATION, s); - - String regionId = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.COUNTRY); - String regionId1 = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS); - if (regionId == null) { - regionId = regionId1; - } - String grade = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.GRADENS); - String schoolid = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SCHOOOlID); - String type = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT); - String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId"); - String devicenumber = GetDevicesUtil.getDevicesInfo(getActivity()).getDeviceNumber(); - String changeinfo = null; - if ("男".equals(presonal3)) { - changeinfo = "male"; + if (Content.changeinfoflag == 1) { + Log.e("test","你提交个人信息"); + if (TextUtils.isEmpty(presonal1) || + TextUtils.isEmpty(presonal2) || TextUtils.isEmpty(presonal3) || TextUtils.isEmpty(presonal4) || + TextUtils.isEmpty(presonal5) || TextUtils.isEmpty(presonal7) || + TextUtils.isEmpty(presonal8)) { + AlertUtils.showToast(getActivity(), "请将信息填写完整！"); + return; } else { - changeinfo = "female"; - } - try { - a = Integer.parseInt(regionId); - b = Integer.parseInt(grade); - if (TextUtils.isEmpty(presonal6)) { - schoolids = null; + + int a = 0, b = 0; + int d = 1; + Object schoolids; + Long f = null; + //保存星座 + BrithdayStar brithdayStar = new BrithdayStar(); + String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString()); + SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.CONSTELLATION, s); + + String regionId = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.COUNTRY); + String regionId1 = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS); + if (regionId == null) { + regionId = regionId1; + } + String grade = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.GRADENS); + String schoolid = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SCHOOOlID); + String type = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT); + String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId"); + String devicenumber = GetDevicesUtil.getDevicesInfo(getActivity()).getDeviceNumber(); + String changeinfo = null; + if ("男".equals(presonal3)) { + changeinfo = "male"; } else { - schoolids = Long.parseLong(schoolid); + changeinfo = "female"; + } + try { + a = Integer.parseInt(regionId); + b = Integer.parseInt(grade); + if (TextUtils.isEmpty(presonal6)) { + schoolids = null; + } else { + schoolids = Long.parseLong(schoolid); + } + d = Integer.parseInt(type); + f = Long.parseLong(userID); + //提交个人信息 + HttpManager.getInstance().changepresonalinfo(getActivity(), + f, d, presonal1, presonal5, b, a, schoolids, presonal8, changeinfo, presonal4 + presonal2, devicenumber); + + } catch (Exception e) { + e.printStackTrace(); } - d = Integer.parseInt(type); - f = Long.parseLong(userID); - //提交个人信息 - HttpManager.getInstance().changepresonalinfo(getActivity(), - f, d, presonal1, presonal5, b, a, schoolids, presonal8, changeinfo, presonal4 + presonal2, devicenumber); - - } catch (Exception e) { - e.printStackTrace(); } break; diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/RegisterFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/RegisterFragment.java index 1e83cbb..f81202f 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/RegisterFragment.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/RegisterFragment.java @@ -19,6 +19,7 @@ import android.widget.ImageView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.activity.RegisterInfoActivity; import com.hjx.personalcenter.db.Content; +import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; import com.hjx.personalcenter.util.AlertUtils; @@ -75,6 +76,7 @@ public class RegisterFragment extends Fragment implements View.OnClickListener { String usernameStr = phonenumber.getText().toString().trim(); String passwordStr = password.getText().toString().trim(); HttpManager.getInstance().saveLoginInfo(getActivity(),usernameStr,passwordStr,access_token,userId); + SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.ACCOUNT, "1"); AlertUtils.showToast(getActivity(), "注册成功！"); Content.accountflag =1; Intent intent = new Intent(); @@ -82,6 +84,8 @@ public class RegisterFragment extends Fragment implements View.OnClickListener { startActivity(intent); getActivity().overridePendingTransition(R.anim.rightin, R.anim.rightout); getActivity().finish(); + }else if(status.equals("209")){ + AlertUtils.showToast(getActivity(), "验证码错误！"); } break; case HttpCode.REGISTERED_FAIL: 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 index 529718b..d8b2bd6 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java @@ -1,23 +1,27 @@ package com.hjx.personalcenter.fragment; +import android.app.Activity; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.GridView; +import android.widget.TextView; +import com.facebook.drawee.view.SimpleDraweeView; import com.hjx.personalcenter.R; import com.hjx.personalcenter.adapter.GridAdapter; import com.hjx.personalcenter.customdialog.VerSionDialog; +import com.hjx.personalcenter.db.Content; import com.hjx.personalcenter.db.SaveParam; import com.hjx.personalcenter.http.HttpCode; import com.hjx.personalcenter.http.HttpManager; -import com.hjx.personalcenter.interfaces.DialogCallBack; import com.hjx.personalcenter.model.DefautPublishInfo; import java.util.ArrayList; @@ -27,13 +31,13 @@ import java.util.List; * Created by h on 2017/8/12. */ -public class VersionsInfoFragment extends Fragment implements AdapterView.OnItemClickListener{ +public class VersionsInfoFragment extends Fragment implements AdapterView.OnItemClickListener, View.OnClickListener { private GridView gridView; private ArrayList defautPublishInfos = new ArrayList<>(); private GridAdapter sim_adapter; private View mView; private int type; - public static String TABLAYOUT_FRAGMENT = "tab_fragment"; + public static String TABLAYOUT_FRAGMENT = "versionfragment"; public static VersionsInfoFragment newInstance(int type) { VersionsInfoFragment fragment = new VersionsInfoFragment(); @@ -61,11 +65,20 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem if (mView == null) { mView = inflater.inflate(R.layout.fragment_changge_version_info, container, false); String userID = SaveParam.getInstance().getLoginParam(getActivity(),"userId"); - String graderid = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.GRADENS); - + String graderid = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.GRADENS); + //子账户年级id + String graderidchilds = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.CHILDSGRADENS); + //账户类型 + String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.ACCOUNT); try { + int graderID; long auserID = Long.parseLong(userID); - int graderID = Integer.parseInt(graderid); + if ("2".equals(accounts)){ + graderID = Integer.parseInt(graderidchilds); + }else { + graderID = Integer.parseInt(graderid); + } + //获取版本信息 HttpManager.getInstance().getpublishinfo(getActivity(),auserID,graderID,handler); @@ -98,41 +111,27 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position){ + SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.SUBJECT,defautPublishInfos.get(position).getSubject()); + VerSionDialog.getInstance().show(getChildFragmentManager(), "VerSionDialog"); - case 0: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"语文"); - break; - case 1: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"数学"); - break; - case 2: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"英语"); - break; - case 3: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"物理"); - break; - case 4: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"化学"); - break; - case 5: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"生物"); - break; - case 6: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"政治"); - break; - case 7: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"历史"); - break; - case 8: - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,"地理"); - break; - } - VerSionDialog.getInstance((DialogCallBack.VersionCallBack)VersionsInfoFragment.this).show(getChildFragmentManager(), "VerSionDialog"); + String imgurl = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.IMGURL); + String version = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.VERSION); + SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish); + TextView publish = (TextView) view.findViewById(R.id.tv_publish); + simpleDraweeView.setImageURI(imgurl); + publish.setText(version); } + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + View rootView = activity.getWindow().getDecorView(); + TextView sub = (TextView) rootView.findViewById(R.id.presonal_sub); + sub.setOnClickListener(this); + } + @Override @@ -140,4 +139,41 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem super.onResume(); } + + @Override + public void onClick(View v) { + switch (v.getId()){ + case R.id.presonal_sub: + if (Content.changeinfoflag ==2){ + Log.e("test","你提交版本信息"); + } + + String userID = SaveParam.getInstance().getLoginParam(getActivity(),"userId"); + //子账户id + String childsidid = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.CHILDSID); + //账户类型 + String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.ACCOUNT); + try { + String id = null; + String piblish = "清华大学出版社"; + if ("2".equals(accounts)){ + id =childsidid; + }else { + id = userID; + } + + //修改版本信息 + HttpManager.getInstance().changepublishinfo(getActivity(),id,piblish + ,piblish,piblish,piblish,piblish,piblish,piblish,piblish,piblish,piblish); + + } catch (NumberFormatException e) { + e.printStackTrace(); + } + + + + break; + } + + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java index 3de2365..0497293 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java @@ -49,6 +49,11 @@ public class HttpCode { public static final int REGISTER_SUCESS = 23; //获取默认版本信息 public static final int PUBLISH_SUCESS = 24; + //注册信息提交 + public static final int REGISTERINFO_SUCESS = 25; + //获取视频信息 + public static final int GETVIDIO_SUCESS = 26; + diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java index 29e359a..8ff842c 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpKey.java @@ -43,6 +43,18 @@ public class HttpKey { public static String BIRDays = "birthday"; public static String QQ = "qq"; public static String GENDER = "gender"; + //版本信息 + public static String CHINESE = "chinese"; + public static String MATH = "math"; + public static String ENGLISH = "english"; + public static String PHYSICES = "physics"; + public static String CHEMISTRY = "chemistry"; + public static String HISTIRY = "history"; + public static String GEOGRAPHY = "geography"; + public static String POLITICAL = "political"; + public static String BIOLOGY = "biology"; + public static String SCIENCE = "science"; + diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java index c4f0763..3cf94c9 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java @@ -7,6 +7,7 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; import android.util.Log; +import android.view.KeyEvent; import android.widget.Toast; import com.google.gson.Gson; @@ -28,6 +29,7 @@ import com.hjx.personalcenter.model.ProvinceInfo; import com.hjx.personalcenter.model.SchoolInfo; import com.hjx.personalcenter.model.SignInfo; import com.hjx.personalcenter.model.VersionInfo; +import com.hjx.personalcenter.model.VideoInfo; import com.hjx.personalcenter.util.AlertUtils; import com.hjx.personalcenter.util.DialogPermission; import com.loopj.android.http.AsyncHttpResponseHandler; @@ -555,8 +557,8 @@ public class HttpManager { * @param handler */ public void getpresonalinfo(final Context mContext, long userId, int type, final Handler handler) { - mProgress = DialogPermission.showProgress(mContext, null, "正在获取个人信息...", - false, true, null); +// mProgress = DialogPermission.showProgress(mContext, null, "正在获取个人信息...", +// false, true, null); HttpClient.getInstance().addHeader("Accept", "application/json"); HttpClient.getInstance().setConnectTimeout(5 * 1000); HttpClient.getInstance().get(HttpUrl.getpresonalinfo + "?userId=" + userId + "&type=" + type, new AsyncHttpResponseHandler() { @@ -642,6 +644,102 @@ public class HttpManager { }); } + //提交注册信息 + public void subregisterinfo(final Context mContext, Long userId + , String name, int gradeId, long regionId, String regionName, Object schoolId, + String math, String english, String physics, String chinese, String chemistry, + String history, String geography, String political, String biology, String science, final Handler handler){ + mProgress = DialogPermission.showProgress(mContext, null, "正在保存个人信息...", + false, true, null); + RequestParams params = new RequestParams(); + + params.put(HttpKey.USEID, userId); + params.put(HttpKey.NAME, name); + params.put(HttpKey.GRADE, gradeId); + params.put(HttpKey.REGION, regionId); + params.put(HttpKey.SCHOOL, schoolId); + params.put(HttpKey.REGIONNAME, regionName); + params.put(HttpKey.MATH, math); + params.put(HttpKey.ENGLISH, english); + params.put(HttpKey.PHYSICES, physics); + params.put(HttpKey.CHINESE, chinese); + params.put(HttpKey.CHEMISTRY, chemistry); + params.put(HttpKey.HISTIRY, history); + params.put(HttpKey.GEOGRAPHY, geography); + params.put(HttpKey.POLITICAL, political); + params.put(HttpKey.BIOLOGY, biology); + params.put(HttpKey.SCIENCE, science); + + Log.e("test", "注册信息" + params); + HttpClient.getInstance().addHeader("Accept", "*/*"); + HttpClient.getInstance().post(mContext, HttpUrl.submitregisterURL, params, new JsonHttpResponseHandler() { + @Override + public void onSuccess(int statusCode, Header[] headers, JSONObject response) { + super.onSuccess(statusCode, headers, response); + closeProgress(); + Message message = Message.obtain(); + message.what = HttpCode.REGISTERINFO_SUCESS; + message.obj = new String(String.valueOf(response)); + handler.sendMessage(message); + + } + + @Override + public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { + super.onFailure(statusCode, headers, throwable, errorResponse); + closeProgress(); + Log.e("test", "onFailure" + errorResponse); + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!"); + } + + }); + } + //修改版本信息 + public void changepublishinfo(final Context mContext, String userId, + String math, String english, String physics, String chinese, String chemistry, + String history, String geography, String political, String biology, String science){ + mProgress = DialogPermission.showProgress(mContext, null, "正在保存个人信息...", + false, true, null); + RequestParams params = new RequestParams(); + params.put(HttpKey.USEID, userId); + params.put(HttpKey.MATH, math); + params.put(HttpKey.ENGLISH, english); + params.put(HttpKey.PHYSICES, physics); + params.put(HttpKey.CHINESE, chinese); + params.put(HttpKey.CHEMISTRY, chemistry); + params.put(HttpKey.HISTIRY, history); + params.put(HttpKey.GEOGRAPHY, geography); + params.put(HttpKey.POLITICAL, political); + params.put(HttpKey.BIOLOGY, biology); + params.put(HttpKey.SCIENCE, science); + + Log.e("test", "版本信息信息" + params); + HttpClient.getInstance().addHeader("Accept", "*/*"); + HttpClient.getInstance().post(mContext, HttpUrl.chagepublishURL, params, new JsonHttpResponseHandler() { + @Override + public void onSuccess(int statusCode, Header[] headers, JSONObject response) { + super.onSuccess(statusCode, headers, response); + closeProgress(); + String status = response.optString("status"); + if (status.equals("1")) { + Toast.makeText(mContext, "版本信息修改成功", Toast.LENGTH_LONG).show(); + ((Activity) mContext).finish(); + } else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试"); + } + + } + + @Override + public void onFailure(int statusCode, Header[] headers, Throwable throwable, JSONObject errorResponse) { + super.onFailure(statusCode, headers, throwable, errorResponse); + closeProgress(); + Log.e("test", "onFailure" + errorResponse); + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!"); + } + + }); + } //修改个性签名 public void changsignature(final Context mContext, long userId, int type, final String signature) { @@ -700,7 +798,7 @@ public class HttpManager { } else if (status == 1000) { - AlertUtils.showToast(mContext, "您还没有签名哦"); + //AlertUtils.showToast(mContext, "您还没有签名哦"); } else { AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); @@ -879,7 +977,7 @@ public class HttpManager { * 添加子账户信息 */ public void addchildAccountinfo(final Context mContext, long parentId, String image, - String name, Long grade, Object school, Long region + String name, final Long grade, Object school, Long region , String deviceNumber, String regionName) { mProgress = DialogPermission.showProgress(mContext, null, "正在添加子账户...", false, true, null); @@ -1150,6 +1248,54 @@ public class HttpManager { }); } + /** + * 获取最近学习视频 + * @param mContext + * @param userId + */ + public void getstuyvidioinfo(final Context mContext, long userId, final Handler handler) { + mProgress = DialogPermission.showProgress(mContext, null, "正在获取最近学习视频...", + false, true, null); + HttpClient.getInstance().setTimeout(5 * 1000); + HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); + HttpClient.getInstance().get(HttpUrl.getvidioURL + "?userId=" + userId , new AsyncHttpResponseHandler() { + @Override + public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { + closeProgress(); + Log.e("test", "近学习视频" + new String(arg2)); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 1) { + VideoInfo videoInfo = GsonTool.getPerson(new String(arg2), VideoInfo.class);//解析json数据 + List schoolInfoBeanList = videoInfo.getData(); + Message msg = Message.obtain(); + msg.what = HttpCode.GETVIDIO_SUCESS; + msg.obj = schoolInfoBeanList; + handler.sendMessage(msg); + + }else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后再试!"); + + } + } catch (JSONException e) { + e.printStackTrace(); + + } + + } + + @Override + public void onFailure(int arg0, Header[] arg1, byte[] arg2, Throwable arg3) { + closeProgress(); + // Log.e("test", "错误信息" + new String(arg2)); + AlertUtils.showToast(mContext, "无法链接到服务器,请检查您的网络或稍后重试!"); + + } + }); + + } + /** * 系统升级 @@ -1386,5 +1532,16 @@ public class HttpManager { e.printStackTrace(); } } + public boolean onKeyDown(int keyCode, KeyEvent event) + { + if (keyCode == KeyEvent.KEYCODE_BACK ) + { + + HttpManager.getInstance().closeProgress(); + } + + return false; + + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java index 6f2f4c3..332417b 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpUrl.java @@ -41,6 +41,9 @@ public class HttpUrl { public static String getversionURL=GetDomain()+"/press/list";//获取版本信息 public static String isRegisterInfoCompleteURL=GetDomain()+"/register/extrainfo/check";//注册信息是否完整 public static String getpublishURL=GetDomain()+"/userPress/info";//获取版本信息 + public static String getvidioURL=GetDomain()+"/personal/video/recent";//获取最近学习视频 + public static String submitregisterURL=GetDomain()+"/register/extrainfo/submit";//提交注册信息 + public static String chagepublishURL=GetDomain()+"/userPress/update";//修改版本信息 diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ChildsInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ChildsInfo.java index 6f0cb9c..1a8c210 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ChildsInfo.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/ChildsInfo.java @@ -84,6 +84,16 @@ public class ChildsInfo implements Serializable { private String name; private String grade; private String image; + + public String getGradeId() { + return gradeId; + } + + public void setGradeId(String gradeId) { + this.gradeId = gradeId; + } + + private String gradeId; private int type; private String deviceNumber; private String subAccountId; diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/VideoInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/VideoInfo.java new file mode 100644 index 0000000..e48df54 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/VideoInfo.java @@ -0,0 +1,101 @@ +package com.hjx.personalcenter.model; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by h on 2017/9/15. + */ + +public class VideoInfo implements Serializable { + + /** + * status : 1 + * pageSize : 0 + * data : [{"videoCover":"http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png","videoUrl":"rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv","videoName":"北京数学5上_05 方程一"},{"videoCover":"http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png","videoUrl":"rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv","videoName":"北京数学5上_05 方程一"},{"videoCover":"http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png","videoUrl":"rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv","videoName":"北京数学5上_05 方程一"},{"videoCover":"http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png","videoUrl":"rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv","videoName":"北京数学5上_05 方程一"},{"videoCover":"http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png","videoUrl":"rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv","videoName":"北京数学5上_05 方程一"},{"videoCover":"http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png","videoUrl":"rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv","videoName":"北京数学5上_05 方程一"}] + * msg : success + * pageNum : 0 + */ + + private int status; + private int pageSize; + private String msg; + private int pageNum; + private List data; + + public void setStatus(int status) { + this.status = status; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public void setData(List data) { + this.data = data; + } + + public int getStatus() { + return status; + } + + public int getPageSize() { + return pageSize; + } + + public String getMsg() { + return msg; + } + + public int getPageNum() { + return pageNum; + } + + public List getData() { + return data; + } + + public static class DataBean { + /** + * videoCover : http://hjxprodbucket.oss.aliyuncs.com/static/upload/online_api/mobile_portrait/2017-09-06/1e03835a-48fd-425e-8ab4-662968ee5377.png + * videoUrl : rtmp://vplay.xuexiao100.com/oflaDemo/M16-FLV/黄冈视频/小学数学/5年级上 北京版(北京出版社)(2014版)/北京数学5上_05 方程一.flv + * videoName : 北京数学5上_05 方程一 + */ + + private String videoCover; + private String videoUrl; + private String videoName; + + public void setVideoCover(String videoCover) { + this.videoCover = videoCover; + } + + public void setVideoUrl(String videoUrl) { + this.videoUrl = videoUrl; + } + + public void setVideoName(String videoName) { + this.videoName = videoName; + } + + public String getVideoCover() { + return videoCover; + } + + public String getVideoUrl() { + return videoUrl; + } + + public String getVideoName() { + return videoName; + } + } +} diff --git a/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml b/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml index d9a4820..31ba573 100644 --- a/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml +++ b/PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml @@ -116,6 +116,7 @@ android:textSize="22sp" /> @@ -362,6 +362,7 @@ @@ -369,7 +370,7 @@ @@ -402,7 +403,6 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="0.1" - android:src="@mipmap/youjiantou" /> @@ -412,7 +412,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="50dp" - android:layout_marginTop="10dp" android:orientation="vertical"> @@ -493,7 +492,7 @@ @@ -531,7 +530,7 @@ @@ -578,7 +577,7 @@ @@ -601,15 +600,15 @@ - - + + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:scrollbars="none" /> + + diff --git a/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml b/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml index 84f4c7c..10c1553 100644 --- a/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml +++ b/PersonalCenter/app/src/main/res/layout/custom_adilog_electroniccard.xml @@ -59,6 +59,7 @@ - diff --git a/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes2.xml b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes2.xml new file mode 100644 index 0000000..b1571c5 --- /dev/null +++ b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes2.xml @@ -0,0 +1,48 @@ + + + + + + + + + + \ No newline at end of file diff --git a/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes3.xml b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes3.xml new file mode 100644 index 0000000..9b41ba4 --- /dev/null +++ b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes3.xml @@ -0,0 +1,41 @@ + + + + + + + + + + \ No newline at end of file