diff --git a/PersonalCenter/.idea/gradle.xml b/PersonalCenter/.idea/gradle.xml index 2d7e4dc..fd9bc3c 100644 --- a/PersonalCenter/.idea/gradle.xml +++ b/PersonalCenter/.idea/gradle.xml @@ -11,6 +11,7 @@ diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml index 5d19981..fbb6828 100644 --- a/PersonalCenter/.idea/misc.xml +++ b/PersonalCenter/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/PersonalCenter/.idea/modules.xml b/PersonalCenter/.idea/modules.xml index 753efba..6dc308a 100644 --- a/PersonalCenter/.idea/modules.xml +++ b/PersonalCenter/.idea/modules.xml @@ -5,6 +5,7 @@ + diff --git a/PersonalCenter/app/build.gradle b/PersonalCenter/app/build.gradle index 257bb09..26cdd85 100644 --- a/PersonalCenter/app/build.gradle +++ b/PersonalCenter/app/build.gradle @@ -46,4 +46,5 @@ dependencies { releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3' compile 'com.google.zxing:core:3.3.0' compile 'com.google.zxing:android-core:3.3.0' + compile project(':mypresonallibrary') } diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml index e221afe..980797b 100644 --- a/PersonalCenter/app/src/main/AndroidManifest.xml +++ b/PersonalCenter/app/src/main/AndroidManifest.xml @@ -122,14 +122,11 @@ android:screenOrientation="landscape"> - + - - - + diff --git a/PersonalCenter/app/src/main/aidl/com/hjx/personalcenter/service/IPresonalInterface.aidl b/PersonalCenter/app/src/main/aidl/com/hjx/personalcenter/service/IPresonalInterface.aidl deleted file mode 100644 index b036d3b..0000000 --- a/PersonalCenter/app/src/main/aidl/com/hjx/personalcenter/service/IPresonalInterface.aidl +++ /dev/null @@ -1,8 +0,0 @@ -// IPresonalInterface.aidl -package com.hjx.personalcenter.service; - -// Declare any non-default types here with import statements - -interface IPresonalInterface { - String sayHello(); -} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java index fa49050..9d748b5 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java @@ -35,6 +35,7 @@ public class MyApplication extends Application { instance = this; CrashReport.initCrashReport(getApplicationContext(), "c2170557a0", false); CrashHandler crashHandler = CrashHandler.getInstance(); + //生成错误日志，测试的时候得放开 crashHandler.init(getApplicationContext()); crashHandler.registerHandler(new CrashHandler.ExceptionHandler() { diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VersionAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VersionAdapter.java new file mode 100644 index 0000000..b466423 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/VersionAdapter.java @@ -0,0 +1,65 @@ +package com.hjx.personalcenter.adapter; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.TextView; + +import com.hjx.personalcenter.R; +import com.hjx.personalcenter.model.VersionInfo; + +import java.util.ArrayList; + +/** + * Created by l on 2017/7/18. + */ + +public class VersionAdapter extends BaseAdapter { + ArrayList objects; + private Context context; + + public VersionAdapter(ArrayList objects, Context context) { + this.objects = objects; + this.context = context; + } + + @Override + public int getCount() { + return objects.size(); + } + + @Override + public Object getItem(int position) { + return position; + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(final int position, View convertView, ViewGroup parent) { + + ViewHolder holder = null; + + if (convertView == null) { + convertView = View.inflate(context, R.layout.custom_adilog_list_item, null); + holder = new ViewHolder(); + holder.nameText = (TextView) convertView.findViewById(R.id.list_items); + convertView.setTag(holder); + } else { + holder = (VersionAdapter.ViewHolder) convertView.getTag(); + } + + holder.nameText.setText(objects.get(position).getPressName()); + + return convertView; + } + + + static class ViewHolder { + TextView nameText; + } +} 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 new file mode 100644 index 0000000..e4e8496 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java @@ -0,0 +1,105 @@ +package com.hjx.personalcenter.customdialog; + +import android.content.Context; +import android.graphics.Color; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +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.ImageView; +import android.widget.ListView; + +import com.hjx.personalcenter.R; +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; + +import java.util.ArrayList; +import java.util.List; + +/** + * 自定义版本信息列表对话框 + * Created by h on 2017/8/10. + */ + +public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener { + private VersionAdapter listadapter; + private ImageView cance; + private ListView listView; + private ArrayList data = new ArrayList<>(); + + private DialogCallBack.VersionCallBack mCallBack; + + Handler handler = new Handler(){ + @Override + public void handleMessage(Message msg) { + super.handleMessage(msg); + switch (msg.what){ + case HttpCode.VERSION_SUCESS: + data.clear(); + data.addAll( (List)msg.obj); + listadapter.notifyDataSetChanged(); + + break; + } + } + }; + public VerSionDialog(DialogCallBack.VersionCallBack callBack) { + this.mCallBack = callBack; + } + + public static VerSionDialog getInstance(DialogCallBack.VersionCallBack callBack) { + VerSionDialog dialogFragment = new VerSionDialog(callBack); + dialogFragment.setCanceledBack(true); + dialogFragment.setCanceledOnTouchOutside(true); + dialogFragment.setRadius(CircleDimen.RADIUS); + dialogFragment.setWidth(0.5f); + dialogFragment.setGravity(Gravity.CENTER); + dialogFragment.setBackgroundColor(Color.WHITE); + return dialogFragment; + } + + @Override + public View createView(Context context, LayoutInflater inflater, ViewGroup container) { + return inflater.inflate(R.layout.custom_adilog_provicelist, container, false); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + listView = (ListView) getView().findViewById(R.id.listadapter); + cance = (ImageView) getView().findViewById(R.id.cancel); + listadapter = new VersionAdapter(data,getActivity()); + listView.setAdapter(listadapter); + listView.setOnItemClickListener(this); + cance.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + String subjectName = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.VERSION); + Log.e("test","选择的科目"+subjectName); + HttpManager.getInstance().versioninfo(getActivity(),subjectName,handler); + + } + + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + //Toast.makeText(getActivity(), "你点击了第" + position + "个", Toast.LENGTH_LONG).show(); + //SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.PROVINCES, ""+data.get(position).getRegionId()); + mCallBack.versionOnItemClick(data,position,1); + 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 a392378..a8a6f0e 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 @@ -39,6 +39,8 @@ public class SaveParam { //账户管理 public static String ACCOUNT = "account";//账户类型 + //版本信息 + public static String VERSION = "version"; public void saveLoginParam(Context context,String spname, String spstr) { 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 fafc9c7..fff85f6 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 @@ -6,10 +6,16 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.GridView; import android.widget.SimpleAdapter; import com.hjx.personalcenter.R; +import com.hjx.personalcenter.customdialog.VerSionDialog; +import com.hjx.personalcenter.db.SaveParam; +import com.hjx.personalcenter.interfaces.DialogCallBack; +import com.hjx.personalcenter.model.VersionInfo; +import com.hjx.personalcenter.util.AlertUtils; import java.util.ArrayList; import java.util.HashMap; @@ -20,7 +26,7 @@ import java.util.Map; * Created by h on 2017/8/12. */ -public class VersionsInfoFragment extends Fragment { +public class VersionsInfoFragment extends Fragment implements AdapterView.OnItemClickListener,DialogCallBack.VersionCallBack { private GridView gridView; private List> data_list; private SimpleAdapter sim_adapter; @@ -85,5 +91,52 @@ public class VersionsInfoFragment extends Fragment { return data_list; } private void setLister() { + gridView.setOnItemClickListener(this); + } + + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position){ + + 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) this).show(getChildFragmentManager(), "VerSionDialog"); + + } + + @Override + public void versionOnItemClick(ArrayList data, int position, int type) { + String regionName = data.get(position).getPressName(); + //SaveParam.getInstance().saveLoginParam(this, "sheng", regionName); + AlertUtils.showToast(getActivity(),regionName); + + } } 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 d18e806..cedb945 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 @@ -43,6 +43,8 @@ public class HttpCode { public static final int CHILDS_SUCESS = 19; //版本升级 public static final int APPUPDATE_SUCESS = 20; + //获取版本信息 + public static final int VERSION_SUCESS = 22; 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 1dcaccf..0cdf372 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 @@ -30,6 +30,7 @@ import com.hjx.personalcenter.model.PesonalInfo; 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.util.AlertUtils; import com.hjx.personalcenter.util.DialogPermission; import com.loopj.android.http.AsyncHttpResponseHandler; @@ -1659,6 +1660,63 @@ public class HttpManager { }); } + //版本信息 + public void versioninfo(final Context mContext,String subjectName, final Handler handler) { + HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"); + HttpClient.getInstance().get(HttpUrl.getversionURL+"?subjectName="+subjectName, new AsyncHttpResponseHandler() { + @Override + public void onSuccess(int arg0, Header[] arg1, byte[] arg2) { + Log.e("test", "版本信息" + new String(arg2)); + try { + JSONObject jsonObject = new JSONObject(new String(arg2)); + int status = jsonObject.optInt("status"); + if (status == 1) { + VersionInfo versionInfo = GsonTool.getPerson(new String(arg2), VersionInfo.class);//解析json数据 + List versionInfoList = versionInfo.getData(); + Message message = Message.obtain(); + message.what = HttpCode.VERSION_SUCESS; + message.obj = versionInfoList; + handler.sendMessage(message); + + } else if(status == 1000){ + AlertUtils.showToast(mContext, "你好，该科目没有版本信息"); + + }else { + AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!"); + } + } catch (JSONException e) { + e.printStackTrace(); + } + + + } + + @Override + public void onFailure(int arg0, Header[] arg1, byte[] arg2, Throwable arg3) { + new CircleDialog.Builder((FragmentActivity) mContext) + .setCanceledOnTouchOutside(false) + .setCancelable(false) + .setWidth(0.5f) + .configText(new ConfigText() { + @Override + public void onConfig(TextParams params) { + params.gravity = Gravity.CENTER; + params.padding = new int[]{50, 50, 50, 50}; + } + }) + .setText("当前无网络，请检查网络设置") + .setNegative("继续使用", null) + .setPositive("设置网络", new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(Settings.ACTION_SETTINGS);//系统设置界面 + mContext.startActivity(intent); + } + }) + .show(); + } + }); + } ///省级接口 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 d329c00..0bc9e51 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 @@ -38,6 +38,7 @@ public class HttpUrl { public static String updateappURL=GetDomain()+"/general/release/version";//系统升级 public static String headerURL=GetDomain()+"/profile/picture/update";//头像上传 public static String headerdefaultURL=GetDomain()+"/profile/picture/default";//默认头像上传 + public static String getversionURL=GetDomain()+"/press/list";//获取版本信息 diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java index c152dc9..bc2c933 100644 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/interfaces/DialogCallBack.java @@ -8,6 +8,7 @@ import com.hjx.personalcenter.model.CountyInfo; import com.hjx.personalcenter.model.GradeInfo; import com.hjx.personalcenter.model.ProvinceInfo; import com.hjx.personalcenter.model.SchoolInfo; +import com.hjx.personalcenter.model.VersionInfo; import java.util.ArrayList; @@ -36,4 +37,8 @@ public class DialogCallBack { public interface CallBackView{ void heard(Context context,View v,int headpitiaon); } + //出版社回调 + public interface VersionCallBack{ + void versionOnItemClick(ArrayList data, int position, int type); + } } diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/VersionInfo.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/VersionInfo.java new file mode 100644 index 0000000..10dda29 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/VersionInfo.java @@ -0,0 +1,92 @@ +package com.hjx.personalcenter.model; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by h on 2017/9/9. + */ + +public class VersionInfo implements Serializable{ + + + /** + * status : 1 + * pageSize : 0 + * data : [{"pressName":"外语教学与研究出版社","pressCover":""},{"pressName":"文汇出版社","pressCover":""},{"pressName":"北京出版社","pressCover":""},{"pressName":"北京出版社_北京教育出版社","pressCover":""},{"pressName":"北京师范大学出版社","pressCover":""},{"pressName":"上海译文出版社","pressCover":""},{"pressName":"接力出版社","pressCover":""},{"pressName":"重庆大学出版社","pressCover":""},{"pressName":"教育科学出版社","pressCover":""},{"pressName":"黑龙江少年儿童出版社","pressCover":""},{"pressName":"人民教育出版社","pressCover":""},{"pressName":"福建教育出版社","pressCover":""},{"pressName":"广东人民出版社","pressCover":""},{"pressName":"中国大百科全书出版社","pressCover":""},{"pressName":"河北教育出版社","pressCover":""},{"pressName":"湖北教育出版社","pressCover":""},{"pressName":"湖南少年儿童出版社","pressCover":""},{"pressName":"湖南教育出版社_山东教育出版社","pressCover":""},{"pressName":"湖南教育出版社","pressCover":""},{"pressName":"西安交通大学出版社","pressCover":""},{"pressName":"高等教育出版社","pressCover":""},{"pressName":"辽宁师范大学出版社","pressCover":""},{"pressName":"科学普及出版社","pressCover":""},{"pressName":"西藏人民出版社","pressCover":""},{"pressName":"培生朗文出版社","pressCover":""},{"pressName":"清华大学出版社","pressCover":""},{"pressName":"上海外语教育出版社","pressCover":""},{"pressName":"上海教育出版社","pressCover":""},{"pressName":"四川人民出版社","pressCover":""},{"pressName":"四川教育出版社","pressCover":""},{"pressName":"山东教育出版社","pressCover":""},{"pressName":"山东科学技术出版社","pressCover":""},{"pressName":"外语教学与研究出版社_广东教育出版社","pressCover":""},{"pressName":"陕西旅游出版社","pressCover":""},{"pressName":"湖南潇影音像出版社","pressCover":""},{"pressName":"金盾出版社","pressCover":""},{"pressName":"外研教学与研究出版社_湖南教育出版社_培生朗文出版社","pressCover":""},{"pressName":"新蕾出版社","pressCover":""},{"pressName":"译林出版社","pressCover":""}] + * msg : success + * pageNum : 0 + */ + + private int status; + private int pageSize; + private String msg; + private int pageNum; + private List data; + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getPageNum() { + return pageNum; + } + + public void setPageNum(int pageNum) { + this.pageNum = pageNum; + } + + public List getData() { + return data; + } + + public void setData(List data) { + this.data = data; + } + + public static class DataBean { + /** + * pressName : 外语教学与研究出版社 + * pressCover : + */ + + private String pressName; + private String pressCover; + + public String getPressName() { + return pressName; + } + + public void setPressName(String pressName) { + this.pressName = pressName; + } + + public String getPressCover() { + return pressCover; + } + + public void setPressCover(String pressCover) { + this.pressCover = pressCover; + } + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/BaseService.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/BaseService.java new file mode 100644 index 0000000..9c20f2e --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/BaseService.java @@ -0,0 +1,66 @@ +/** + * HaoJiXing Teacher Q&A + * copyright(C)2013- Acorn International + * + * packeage：com.ozing.center.service.BaseService.java + * create：2013年11月5日下午6:05:40 + */ +package com.hjx.personalcenter.service; + +import android.app.Service; +import android.content.Intent; +import android.content.res.Configuration; +import android.os.IBinder; + +/** + * @author jixiaolong + * @code: 015261 + */ +public class BaseService extends Service { + + @Override + public IBinder onBind(Intent intent) { + return null; + } + + @Override + public void onCreate() { + // TODO Auto-generated method stub + super.onCreate(); + } + + @Override + public int onStartCommand(Intent intent, int flags, int startId) { + return super.onStartCommand(intent, flags, startId); + }; + + @Override + public void onDestroy() { + super.onDestroy(); + } + + @Override + public boolean onUnbind(Intent intent) { + // TODO Auto-generated method stub + return super.onUnbind(intent); + } + + @Override + public void onLowMemory() { + // TODO Auto-generated method stub + super.onLowMemory(); + } + + @Override + public void onRebind(Intent intent) { + // TODO Auto-generated method stub + super.onRebind(intent); + } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + // TODO Auto-generated method stub + super.onConfigurationChanged(newConfig); + } + +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java new file mode 100644 index 0000000..e9e20e2 --- /dev/null +++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java @@ -0,0 +1,41 @@ +package com.hjx.personalcenter.service; + +import android.content.Intent; +import android.os.IBinder; +import android.os.RemoteException; + +/** + * Created by h on 2017/9/1. + */ + +public class CenterService extends BaseService { + public CenterService(){ + + } + IPresonalInterface.Stub binder = new IPresonalInterface.Stub() { + @Override + public String sayHello() throws RemoteException { + return "这是测试AIDL的方法"; + } + + @Override + public String viewPage(String action) throws RemoteException { + return null; + } + + @Override + public String getSimpleUser() throws RemoteException { + return null; + } + + @Override + public String getcardUser() throws RemoteException { + return null; + } + }; + + @Override + public IBinder onBind(Intent intent) { + return binder; + } +} diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/TestService.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/TestService.java deleted file mode 100644 index b74cb5f..0000000 --- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/TestService.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hjx.personalcenter.service; - -import android.app.Service; -import android.content.Intent; -import android.os.IBinder; -import android.os.RemoteException; - -/** - * Created by h on 2017/9/1. - */ - -public class TestService extends Service { - public TestService(){ - - } - IPresonalInterface.Stub binder = new IPresonalInterface.Stub() { - @Override - public String sayHello() throws RemoteException { - return "这是测试AIDL的方法"; - } - }; - - @Override - public IBinder onBind(Intent intent) { - return binder; - } -} diff --git a/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes.xml b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes.xml index 8c6b906..d096450 100644 --- a/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes.xml +++ b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info_itmes.xml @@ -21,7 +21,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/login_text_black" - android:text="语文" + android:text="" /> Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.hjx.mypresonallibrary.test", appContext.getPackageName()); + } +} diff --git a/PersonalCenter/mypresonallibrary/src/main/AndroidManifest.xml b/PersonalCenter/mypresonallibrary/src/main/AndroidManifest.xml new file mode 100644 index 0000000..9eb095d --- /dev/null +++ b/PersonalCenter/mypresonallibrary/src/main/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/PersonalCenter/mypresonallibrary/src/main/aidl/com/hjx/personalcenter/service/IPresonalInterface.aidl b/PersonalCenter/mypresonallibrary/src/main/aidl/com/hjx/personalcenter/service/IPresonalInterface.aidl new file mode 100644 index 0000000..73b6914 --- /dev/null +++ b/PersonalCenter/mypresonallibrary/src/main/aidl/com/hjx/personalcenter/service/IPresonalInterface.aidl @@ -0,0 +1,15 @@ +// IPresonalInterface.aidl +package com.hjx.personalcenter.service; + +// Declare any non-default types here with import statements + +interface IPresonalInterface { + //测试AIDL + String sayHello(); + //UI view 所有的页面 + String viewPage(String action); + //得到用户登录信息 + String getSimpleUser(); + //得到用户保卡信息 + String getcardUser(); +} diff --git a/PersonalCenter/mypresonallibrary/src/main/res/values/strings.xml b/PersonalCenter/mypresonallibrary/src/main/res/values/strings.xml new file mode 100644 index 0000000..ac3a13e --- /dev/null +++ b/PersonalCenter/mypresonallibrary/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + MyPresonalLibrary + diff --git a/PersonalCenter/mypresonallibrary/src/test/java/com/hjx/mypresonallibrary/ExampleUnitTest.java b/PersonalCenter/mypresonallibrary/src/test/java/com/hjx/mypresonallibrary/ExampleUnitTest.java new file mode 100644 index 0000000..22cb6e2 --- /dev/null +++ b/PersonalCenter/mypresonallibrary/src/test/java/com/hjx/mypresonallibrary/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.hjx.mypresonallibrary; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/PersonalCenter/settings.gradle b/PersonalCenter/settings.gradle index 4e1e695..7dda2a2 100644 --- a/PersonalCenter/settings.gradle +++ b/PersonalCenter/settings.gradle @@ -1 +1 @@ -include ':app', ':circledialog', ':pickerview' +include ':app', ':circledialog', ':pickerview', ':mypresonallibrary'