hjx-app / PresonalCenter

Download as
Browse Code »

Commit 661a7bcfd73f43258a5121a1695f2618abb1a6f2

Authored by xiongwei
1 parent b0a7a1fce1
Exists in master

处理包问题

Showing 15 changed files with 531 additions and 55 deletions   Show diff stats
PersonalCenter/app/src/main/AndroidManifest.xml
Diff comments   View file @661a7bc
... ... @@ -2,6 +2,7 @@
2 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 package="com.hjx.personalcenter">
4 4  
  5 + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
5 6 <application
6 7 android:allowBackup="true"
7 8 android:icon="@mipmap/ic_launcher"
... ... @@ -114,6 +115,7 @@
114 115 android:screenOrientation="landscape">
115 116  
116 117 </activity>
  118 + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
117 119 </application>
118 120  
119 121 </manifest>
120 122 \ No newline at end of file
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
Diff comments   View file @661a7bc
... ... @@ -6,6 +6,8 @@ import android.graphics.Color;
6 6 import android.os.Bundle;
7 7 import android.view.View;
8 8 import android.widget.Button;
  9 +import android.widget.EditText;
  10 +import android.widget.ImageView;
9 11 import android.widget.LinearLayout;
10 12 import android.widget.TextView;
11 13  
... ... @@ -13,7 +15,6 @@ import com.bigkoo.pickerview.TimePickerView;
13 15 import com.hjx.personalcenter.R;
14 16  
15 17 import java.text.SimpleDateFormat;
16   -import java.util.Calendar;
17 18 import java.util.Date;
18 19  
19 20 /**填写保卡信息 熊巍
... ... @@ -22,9 +23,11 @@ import java.util.Date;
22 23  
23 24 public class ElectronicCardEditInfoActivity extends Activity implements View.OnClickListener {
24 25 private LinearLayout lineL_buy_time;
25   - private TextView tv_buy_time;
  26 + private TextView tv_buy_time,adress_shop,adress_custem;
  27 + private EditText username,store,detalAdress,telphone;
26 28 private TimePickerView pvTime;
27 29 private Button btn_change_info;
  30 + private ImageView iv_card_back;
28 31  
29 32 @Override
30 33 protected void onCreate(Bundle savedInstanceState) {
... ... @@ -39,6 +42,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
39 42 private void initView() {
40 43 lineL_buy_time = (LinearLayout) findViewById(R.id.lineL_buy_time);
41 44 tv_buy_time = (TextView) findViewById(R.id.tv_buy_time);
  45 + adress_shop = (TextView) findViewById(R.id.tv_edit_adress_shop);
  46 + adress_custem = (TextView) findViewById(R.id.tv_edit_adress_custem);
  47 + username = (EditText) findViewById(R.id.et_edit_username);
  48 + store = (EditText) findViewById(R.id.et_edit_store);
  49 + detalAdress = (EditText) findViewById(R.id.et_edit_adress_detail);
  50 + telphone = (EditText) findViewById(R.id.et_edit_telphone);
42 51 btn_change_info = (Button) findViewById(R.id.btn_change_info);
43 52 }
44 53  
... ... @@ -48,17 +57,20 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
48 57  
49 58 private void initLister() {
50 59 lineL_buy_time.setOnClickListener(this);
  60 + adress_shop.setOnClickListener(this);
  61 + adress_custem.setOnClickListener(this);
51 62 btn_change_info.setOnClickListener(this);
52 63  
53 64 }
  65 + //自定义时间选择器
54 66 private void initTimePicker() {
55 67 //控制时间范围(如果不设置范围，则使用默认时间1900-2100年，此段代码可注释)
56 68 //因为系统Calendar的月份是从0-11的,所以如果是调用Calendar的set方法来设置时间,月份的范围也要是从0-11
57   - Calendar selectedDate = Calendar.getInstance();
58   - Calendar startDate = Calendar.getInstance();
59   - startDate.set(1900, 1, 1);
60   - Calendar endDate = Calendar.getInstance();
61   - endDate.set(2100, 1, 1);
  69 +// Calendar selectedDate = Calendar.getInstance();
  70 +// Calendar startDate = Calendar.getInstance();
  71 +// startDate.set(1900, 1, 1);
  72 +// Calendar endDate = Calendar.getInstance();
  73 +// endDate.set(2100, 1, 1);
62 74 //时间选择器
63 75 pvTime = new TimePickerView.Builder(this, new TimePickerView.OnTimeSelectListener() {
64 76 @Override
... ... @@ -75,8 +87,8 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
75 87 .isCenterLabel(false)
76 88 .setDividerColor(Color.DKGRAY)
77 89 .setContentSize(21)
78   - .setDate(selectedDate)
79   - .setRangDate(startDate, endDate)
  90 +// .setDate(selectedDate)
  91 +// .setRangDate(startDate, endDate)
80 92 .setBackgroundId(0x80000000) //设置外部遮罩颜色
81 93 .setDecorView(null)
82 94 .setTitleText("购买日期")
... ... @@ -104,6 +116,12 @@ public class ElectronicCardEditInfoActivity extends Activity implements View.OnC
104 116 startActivity(intent);
105 117 overridePendingTransition(R.anim.rightin, R.anim.rightout);
106 118 break;
  119 + case R.id.tv_edit_adress_shop:
  120 +
  121 + break;
  122 + case R.id.tv_edit_adress_custem:
  123 + break;
  124 +
107 125 }
108 126  
109 127  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java
Diff comments   View file @661a7bc
... ... @@ -5,8 +5,11 @@ import android.content.Intent;
5 5 import android.os.Bundle;
6 6 import android.view.View;
7 7 import android.widget.Button;
  8 +import android.widget.ImageView;
  9 +import android.widget.TextView;
8 10  
9 11 import com.hjx.personalcenter.R;
  12 +import com.hjx.personalcenter.util.GetDevicesUtil;
10 13  
11 14 /**确认保卡信息
12 15 * Created by h on 2017/8/11.
... ... @@ -14,6 +17,8 @@ import com.hjx.personalcenter.R;
14 17  
15 18 public class ElectronicCardInfoOKActivity extends Activity implements View.OnClickListener {
16 19 private Button btn_finish;
  20 + private ImageView iv_last_step;
  21 + private TextView usename,deviceModel,customer_address,mac_adress,shoptime,deviceNumber,shopadress,phone,tlePhone;
17 22 @Override
18 23 protected void onCreate(Bundle savedInstanceState) {
19 24 super.onCreate(savedInstanceState);
... ... @@ -24,9 +29,23 @@ public class ElectronicCardInfoOKActivity extends Activity implements View.OnCli
24 29 }
25 30 private void initView() {
26 31 btn_finish = (Button) findViewById(R.id.btn_finish);
  32 + usename = (TextView) findViewById(R.id.iv_card_username);
  33 + deviceModel = (TextView) findViewById(R.id.tv_card_deviceModel);
  34 + customer_address = (TextView) findViewById(R.id.tv_card_adress);
  35 + mac_adress = (TextView) findViewById(R.id.tv_card_mac);
  36 + shoptime = (TextView) findViewById(R.id.tv_card_time);
  37 + deviceNumber = (TextView) findViewById(R.id.tv_card_deviceNumber);
  38 + shopadress = (TextView) findViewById(R.id.tv_card_shopAdress);
  39 + phone = (TextView) findViewById(R.id.tv_card_phone);
  40 + tlePhone = (TextView) findViewById(R.id.tv_card_tleNember);
27 41 }
28 42  
29 43 private void initData() {
  44 + //获取设备信息
  45 + deviceModel.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceModel());
  46 + deviceNumber.setText(GetDevicesUtil.getDevicesInfo(this).getDeviceNumber());
  47 + mac_adress.setText(GetDevicesUtil.getDevicesInfo(this).getMac());
  48 + //获取保卡信息
30 49  
31 50 }
32 51  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @661a7bc
... ... @@ -5,11 +5,13 @@ import android.os.Bundle;
5 5 import android.support.v7.app.AppCompatActivity;
6 6 import android.view.View;
7 7 import android.widget.ImageView;
  8 +import android.widget.TextView;
8 9  
9 10 import com.hjx.personalcenter.R;
10 11  
11 12 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
12   - ImageView iv_imformatioan;
  13 + private ImageView iv_imformatioan,iv_look_card,iv_setting;
  14 + private TextView tv_edit_presoninfo;
13 15 @Override
14 16 protected void onCreate(Bundle savedInstanceState) {
15 17 super.onCreate(savedInstanceState);
... ... @@ -21,6 +23,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
21 23  
22 24 private void initView() {
23 25 iv_imformatioan = (ImageView) findViewById(R.id.iv_imformatioan);
  26 + iv_look_card = (ImageView) findViewById(R.id.iv_look_card);
  27 + tv_edit_presoninfo = (TextView) findViewById(R.id.tv_edit_presoninfo);
  28 + iv_setting = (ImageView) findViewById(R.id.iv_setting);
24 29 }
25 30  
26 31 private void initData() {
... ... @@ -29,6 +34,10 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
29 34  
30 35 private void initLister() {
31 36 iv_imformatioan.setOnClickListener(this);
  37 + iv_look_card.setOnClickListener(this);
  38 + tv_edit_presoninfo.setOnClickListener(this);
  39 + iv_setting.setOnClickListener(this);
  40 +
32 41 }
33 42  
34 43 @Override
... ... @@ -36,10 +45,28 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
36 45 switch (v.getId()){
37 46 case R.id.iv_imformatioan:
38 47 Intent intent = new Intent();
39   - intent.setClass(MainActivity.this,LoginAndRegisterActivity.class);
  48 + intent.setClass(MainActivity.this,FeedBackActivity.class);
40 49 startActivity(intent);
41 50 overridePendingTransition(R.anim.rightin, R.anim.rightout);
42 51 break;
  52 + case R.id.iv_look_card:
  53 + Intent lookintent = new Intent();
  54 + lookintent.setClass(MainActivity.this,ElectronicCardLookInfoActivity.class);
  55 + startActivity(lookintent);
  56 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  57 + break;
  58 + case R.id.tv_edit_presoninfo:
  59 + Intent editintent = new Intent();
  60 + editintent.setClass(MainActivity.this,ChangePresonalInfoActivity.class);
  61 + startActivity(editintent);
  62 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  63 + break;
  64 + case R.id.iv_setting:
  65 + Intent settingintent = new Intent();
  66 + settingintent.setClass(MainActivity.this,LoginAndRegisterActivity.class);
  67 + startActivity(settingintent);
  68 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  69 + break;
43 70 }
44 71  
45 72 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
Diff comments   View file @661a7bc
... ... @@ -49,7 +49,7 @@ public class VersionsInfoFragment extends Fragment {
49 49 @Override
50 50 public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
51 51 if (mView == null) {
52   - mView = inflater.inflate(R.layout.activity_choisetextbook, container, false);
  52 + mView = inflater.inflate(R.layout.fragment_changge_version_info, container, false);
53 53 initView(mView);
54 54 initData();
55 55 setLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/DeviceInfo.java
Diff comments   View file @661a7bc
... ... @@ -0,0 +1,43 @@
  1 +package com.hjx.personalcenter.model;
  2 +
  3 +/**
  4 + * Created by h on 2017/8/14.
  5 + */
  6 +
  7 +public class DeviceInfo {
  8 + private String mac = null; //:"D0-DF-9A-5F-A2-0A"网卡地址
  9 + private String deviceNumber = null;//":"43234-51518888-2557",
  10 + private String deviceModel = null;//:"M18",
  11 +
  12 +
  13 + public String getDeviceNumber() {
  14 + return deviceNumber;
  15 + }
  16 +
  17 + public void setDeviceNumber(String deviceNumber) {
  18 + this.deviceNumber = deviceNumber;
  19 + }
  20 +
  21 +
  22 +
  23 + public String getDeviceModel() {
  24 + return deviceModel;
  25 + }
  26 +
  27 + public void setDeviceModel(String deviceModel) {
  28 + this.deviceModel = deviceModel;
  29 + }
  30 +
  31 +
  32 +
  33 + public String getMac() {
  34 + return mac;
  35 + }
  36 +
  37 + public void setMac(String mac) {
  38 + this.mac = mac;
  39 + }
  40 +
  41 +
  42 +
  43 +}
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java
Diff comments   View file @661a7bc
... ... @@ -0,0 +1,62 @@
  1 +package com.hjx.personalcenter.util;
  2 +
  3 +import android.content.Context;
  4 +import android.net.wifi.WifiInfo;
  5 +import android.net.wifi.WifiManager;
  6 +import android.util.Log;
  7 +
  8 +import com.hjx.personalcenter.model.DeviceInfo;
  9 +
  10 +
  11 +public class GetDevicesUtil {
  12 + private final static String LOG_TAG = "GetDevicesUtil";
  13 +
  14 + public static String getDevicesJson(Context context){
  15 + DeviceInfo mDeviceInfo = new DeviceInfo();
  16 + initDevicesInfo(mDeviceInfo,context);
  17 +
  18 + StringBuilder sb = new StringBuilder();
  19 + sb.append("\"devices\":[{");
  20 + sb.append("\"deviceNumber\":").append("\"").append( mDeviceInfo.getDeviceNumber()).append("\",");
  21 + sb.append("\"deviceModel\":").append("\"").append(mDeviceInfo.getDeviceModel()).append("\",");
  22 + sb.append("\"mac\":").append("\"").append(mDeviceInfo.getMac()).append("\",");
  23 + sb.append("}]");
  24 + Log.i(LOG_TAG, sb.toString());
  25 + return sb.toString();
  26 + }
  27 +
  28 + public static DeviceInfo getDevicesInfo(Context context){
  29 + DeviceInfo mDeviceInfo = new DeviceInfo();
  30 + initDevicesInfo(mDeviceInfo,context);
  31 +
  32 + return mDeviceInfo;
  33 + }
  34 +
  35 + public static void initDevicesInfo(DeviceInfo mDeviceInfo,Context context){
  36 + mDeviceInfo.setDeviceModel(android.os.Build.MODEL);
  37 + Log.e(LOG_TAG,"" + mDeviceInfo.getDeviceModel());
  38 + mDeviceInfo.setMac(getMacAddress(context));
  39 + Log.e(LOG_TAG,"" + mDeviceInfo.getMac());
  40 +
  41 + mDeviceInfo.setDeviceNumber(getCPUSerial(context));
  42 + Log.e(LOG_TAG,"" + mDeviceInfo.getDeviceModel());
  43 + }
  44 +
  45 + private static String getCPUSerial(Context context) {
  46 + return MachineUtil.getMachineCode(context);
  47 + }
  48 +
  49 + private static String getMacAddress(Context mContext){
  50 +
  51 + String ret = null;
  52 + try {
  53 + WifiManager manager = (WifiManager)mContext.getSystemService(Context.WIFI_SERVICE);
  54 + WifiInfo info = manager.getConnectionInfo();
  55 + ret = info.getMacAddress();
  56 + } catch (Exception e) {
  57 + Log.e(LOG_TAG, "get wifi address wrong", e);
  58 + }
  59 + Log.i(LOG_TAG, "wifi address is" + ret);
  60 + return ret;
  61 + }
  62 +}
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/LogUtil.java
Diff comments   View file @661a7bc
... ... @@ -0,0 +1,143 @@
  1 +package com.hjx.personalcenter.util;
  2 +
  3 +import java.io.File;
  4 +import java.io.FileNotFoundException;
  5 +import java.io.FileOutputStream;
  6 +import java.io.IOException;
  7 +import java.text.SimpleDateFormat;
  8 +import java.util.Date;
  9 +
  10 +public class LogUtil
  11 +{
  12 + private static com.hjx.personalcenter.util.LogUtil _lg;
  13 + //single
  14 + public static com.hjx.personalcenter.util.LogUtil Instance(){
  15 + if(_lg == null){
  16 + _lg = new com.hjx.personalcenter.util.LogUtil();
  17 + }
  18 + return _lg;
  19 + }
  20 +
  21 + //日志保存的数量 ,默认保存最近10天的日志
  22 + public int logSaveNum=10;
  23 +
  24 + /**插入日志*/
  25 + public void WriteLog(String msg){
  26 + if(LOG_SWITCH){
  27 + System.out.println("插入日子的信息：" + msg);
  28 + File file = checkLogFileIsExist();
  29 + if(file == null)
  30 + return;
  31 + FileOutputStream fos = null;
  32 + try
  33 + {
  34 + fos = new FileOutputStream(file, true);
  35 + fos.write((new Date().toLocaleString() + " " + msg).getBytes("gbk"));
  36 + fos.write("\r\n".getBytes("gbk"));
  37 + }
  38 + catch (FileNotFoundException e)
  39 + {
  40 + e.printStackTrace();
  41 + }
  42 + catch (IOException e)
  43 + {
  44 + e.printStackTrace();
  45 + }
  46 + finally{
  47 + try
  48 + {
  49 + if(fos != null){
  50 + fos.close();
  51 + fos = null;
  52 + }
  53 + }
  54 + catch (IOException e)
  55 + {
  56 + e.printStackTrace();
  57 + }
  58 + fos = null;
  59 + file = null;
  60 + }
  61 + }
  62 + }
  63 + /**
  64 + * 打印异常堆栈信息
  65 + * @param e
  66 + * @return
  67 + */
  68 + public void WriteStackTrace(Throwable e){
  69 + if(e != null){
  70 + //StringWriter sw = new StringWriter();
  71 + //PrintWriter pw = new PrintWriter(sw);
  72 + //e.printStackTrace(pw);
  73 + //return sw.toString();
  74 + WriteLog(e.getStackTrace().toString());
  75 + }
  76 + //return "";
  77 + }
  78 +
  79 +
  80 +
  81 +
  82 + private LogUtil()
  83 + {
  84 + CheckLogDele();
  85 +
  86 + }
  87 +
  88 + private void CheckLogDele()
  89 + {
  90 + //todo 扫描sd卡下面的日志文件，删除超过logSaveNum的日志
  91 +
  92 + }
  93 +
  94 + /**日志保存路径*/
  95 + private static final String LOG_SAVE_PATH = "/sdcard/Log/"; //sd卡上的日志文件目录
  96 + /**日志开关*/
  97 + private static final boolean LOG_SWITCH = true;
  98 +
  99 + /**检查日志文件是否存在*/
  100 + private File checkLogFileIsExist(){
  101 + //if(!MemorySpaceManager.isSDExist()){ //sd 卡是否存在
  102 + // return null;
  103 + //}
  104 + File file = new File(LOG_SAVE_PATH);
  105 + if(!file.exists()){
  106 + file.mkdirs();
  107 + }
  108 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  109 + String dateStr = sdf.format(new Date());
  110 + file = new File(LOG_SAVE_PATH + dateStr + ".txt");
  111 + if(!isLogExist(file)){
  112 + try
  113 + {
  114 + file.createNewFile();
  115 + }
  116 + catch (IOException e)
  117 + {
  118 + e.printStackTrace();
  119 + }
  120 + }
  121 + sdf = null;
  122 + return file;
  123 + }
  124 +
  125 + /**
  126 + * 检查当天日志文件是否存在
  127 + * @param file
  128 + * @return
  129 + */
  130 + private boolean isLogExist(File file){
  131 + File tempFile = new File(LOG_SAVE_PATH);
  132 + File[] files = tempFile.listFiles();
  133 + if(files!=null){
  134 + for(int i = 0; i < files.length; i++){
  135 + if(files[0].getName().trim().equalsIgnoreCase(file.getName())){
  136 + return true;
  137 + }
  138 + }
  139 + }
  140 + return false;
  141 + }
  142 +
  143 +}
0 144 \ No newline at end of file
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/MachineUtil.java
Diff comments   View file @661a7bc
... ... @@ -0,0 +1,82 @@
  1 +package com.hjx.personalcenter.util;
  2 +
  3 +import android.content.Context;
  4 +import android.os.Build;
  5 +import android.telephony.TelephonyManager;
  6 +import android.text.TextUtils;
  7 +
  8 +import java.io.InputStreamReader;
  9 +import java.io.LineNumberReader;
  10 +
  11 +public class MachineUtil {
  12 +
  13 + public static String getMachineCode(Context context) {
  14 + String cpuAddress = null;
  15 + try{
  16 +// PmpsManager pmps = new PmpsManager();
  17 +// cpuAddress = pmps.getDeviceId(context);
  18 + }catch(Exception e){
  19 + com.hjx.personalcenter.util.LogUtil.Instance().WriteLog("mac地址获取失败");
  20 + }catch(NoClassDefFoundError e){
  21 + com.hjx.personalcenter.util.LogUtil.Instance().WriteLog("设备不是好记星");
  22 + }
  23 + if(!TextUtils.isEmpty(cpuAddress) && !"A818A81800".equals(cpuAddress)){
  24 + //Log.e("=========.MACHINE.=========", "function 1 get device id:"+cpuAddress);
  25 + return cpuAddress;
  26 + }
  27 +
  28 + try{
  29 + cpuAddress = android.provider.Settings.System.getString(context.getContentResolver(), "serial_number").trim();
  30 + }catch(Exception e){
  31 + com.hjx.personalcenter.util.LogUtil.Instance().WriteLog("=========.MACHINE.=========function 2 get device id error");
  32 + }
  33 + if(!TextUtils.isEmpty(cpuAddress)){
  34 + //Log.e("=========.MACHINE.=========", "function 2 get device id:"+cpuAddress);
  35 + return cpuAddress;
  36 + }
  37 +
  38 + try {
  39 + if("Top".equals(Build.MODEL)){
  40 + String str = "", strCPU = "";
  41 + // 读取CPU信息
  42 + Process pp = Runtime.getRuntime().exec("cat/proc/cpuinfo");
  43 + InputStreamReader ir = new InputStreamReader(pp.getInputStream());
  44 + LineNumberReader input = new LineNumberReader(ir);
  45 + // 查找CPU序列号
  46 + for (int i = 1; i < 100; i++) {
  47 + str = input.readLine();
  48 + if (str != null) {
  49 + // 查找到序列号所在行
  50 + if (str.indexOf("Serial") > -1) {
  51 + // 提取序列号
  52 + strCPU = str.substring(str.indexOf(":") + 1, str.length());
  53 + cpuAddress = strCPU.trim();
  54 + break;
  55 + }
  56 + } else {
  57 + break;
  58 + }
  59 + }
  60 + }
  61 + } catch (Exception e) {
  62 + com.hjx.personalcenter.util.LogUtil.Instance().WriteLog("=========.MACHINE.=========function 3 get device id error");
  63 + }
  64 + if(!TextUtils.isEmpty(cpuAddress)){
  65 + //Log.e("=========.MACHINE.=========", "function 3 get device id:"+cpuAddress);
  66 + return cpuAddress;
  67 + }
  68 +
  69 + try{
  70 + cpuAddress = ((TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
  71 + }catch(Exception e){
  72 + com.hjx.personalcenter.util.LogUtil.Instance().WriteLog("=========.MACHINE.=========function 4 get device id error");
  73 + }
  74 + if(!TextUtils.isEmpty(cpuAddress)){
  75 + //Log.e("=========.MACHINE.=========", "function 4 get device id:"+cpuAddress);
  76 + return cpuAddress;
  77 + }
  78 +
  79 + cpuAddress = "unknown";
  80 + return cpuAddress;
  81 + }
  82 +}
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/SaveParam.java
Diff comments   View file @661a7bc
... ... @@ -0,0 +1,57 @@
  1 +package com.hjx.personalcenter.util;
  2 +
  3 +import android.app.Activity;
  4 +import android.content.Context;
  5 +import android.content.SharedPreferences;
  6 +
  7 +public class SaveParam {
  8 +
  9 + private static SaveParam instance;
  10 + public static SaveParam getInstance(){
  11 + if (instance==null){
  12 + instance = new SaveParam();
  13 + }
  14 + return instance;
  15 + }
  16 +
  17 +
  18 + public void saveLoginParam(Context context,String spname, String spstr) {
  19 + SharedPreferences sp = context.getSharedPreferences("loginparam",
  20 + Activity.MODE_PRIVATE);
  21 +
  22 + sp.edit().putString(spname, spstr).commit();
  23 + }
  24 +
  25 + public String getLoginParam(Context context,String spname) {
  26 + SharedPreferences sp = context.getSharedPreferences("loginparam",
  27 + Activity.MODE_PRIVATE);
  28 + String param = sp.getString(spname, null);
  29 + return param;
  30 + }
  31 + public void clearData(Context context) {
  32 + SharedPreferences sp = context.getSharedPreferences("loginparam",
  33 + Activity.MODE_PRIVATE);
  34 + sp.edit().clear().commit();
  35 + }
  36 +
  37 + public void saveCustomizeParam(Context context,String spname, String spstr) {
  38 + SharedPreferences sp = context.getSharedPreferences("presoninfo",
  39 + Activity.MODE_PRIVATE);
  40 +
  41 + sp.edit().putString(spname, spstr).commit();
  42 +
  43 + }
  44 +
  45 + public String getCustomizeParam(Context context,String spname) {
  46 + SharedPreferences sp = context.getSharedPreferences("presoninfo",
  47 + Activity.MODE_PRIVATE);
  48 + String param = sp.getString(spname, null);
  49 + return param;
  50 + }
  51 +
  52 + public void clearCustomizeParam(Context context ){
  53 + SharedPreferences sp = context.getSharedPreferences("presoninfo",
  54 + Activity.MODE_PRIVATE);
  55 + sp.edit().clear().commit();
  56 + }
  57 +}
... ...
PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
Diff comments   View file @661a7bc
... ... @@ -273,6 +273,7 @@
273 273 android:layout_width="match_parent"
274 274 android:layout_height="wrap_content"
275 275 android:gravity="center_vertical"
  276 + android:layout_marginBottom="30dp"
276 277 android:orientation="horizontal">
277 278  
278 279 <LinearLayout
... ...
PersonalCenter/app/src/main/res/layout/activity_electroniccard_info.xml
Diff comments   View file @661a7bc
... ... @@ -13,7 +13,7 @@
13 13 android:minHeight="50dp">
14 14  
15 15 <ImageView
16   - android:id="@+id/cancel"
  16 + android:id="@+id/iv_card_back"
17 17 android:layout_width="wrap_content"
18 18 android:layout_height="wrap_content"
19 19 android:layout_centerVertical="true"
... ... @@ -80,10 +80,11 @@
80 80 android:layout_width="wrap_content"
81 81 android:layout_height="wrap_content"
82 82 android:text="客户姓名"
83   - android:textColor="@color/pickerview_wheelview_textcolor_center"
  83 + android:textColor="@color/electronic_text"
84 84 android:textSize="22sp" />
85 85  
86 86 <EditText
  87 + android:id="@+id/et_edit_username"
87 88 android:layout_width="wrap_content"
88 89 android:layout_height="wrap_content"
89 90 android:layout_marginLeft="50dp"
... ... @@ -104,10 +105,11 @@
104 105 android:layout_width="150dp"
105 106 android:layout_height="wrap_content"
106 107 android:text="购买地址"
107   - android:textColor="@color/pickerview_wheelview_textcolor_center"
  108 + android:textColor="@color/electronic_text"
108 109 android:textSize="22sp" />
109 110  
110 111 <TextView
  112 + android:id="@+id/tv_edit_adress_shop"
111 113 android:layout_width="wrap_content"
112 114 android:layout_height="wrap_content"
113 115 android:layout_marginLeft="20dp"
... ... @@ -167,10 +169,11 @@
167 169 android:layout_width="wrap_content"
168 170 android:layout_height="wrap_content"
169 171 android:text="客户地址"
170   - android:textColor="@color/pickerview_wheelview_textcolor_center"
  172 + android:textColor="@color/electronic_text"
171 173 android:textSize="22sp" />
172 174  
173 175 <TextView
  176 + android:id="@+id/tv_edit_adress_custem"
174 177 android:layout_width="wrap_content"
175 178 android:layout_height="wrap_content"
176 179 android:layout_marginLeft="50dp"
... ... @@ -202,6 +205,7 @@
202 205 android:textSize="22sp" />
203 206  
204 207 <EditText
  208 + android:id="@+id/et_edit_store"
205 209 android:layout_width="wrap_content"
206 210 android:layout_height="wrap_content"
207 211 android:layout_marginLeft="20dp"
... ... @@ -259,6 +263,7 @@
259 263 android:textSize="22sp" />
260 264  
261 265 <EditText
  266 + android:id="@+id/et_edit_adress_detail"
262 267 android:layout_width="wrap_content"
263 268 android:layout_height="wrap_content"
264 269 android:layout_marginLeft="100dp"
... ... @@ -278,16 +283,17 @@
278 283 android:layout_width="150dp"
279 284 android:layout_height="wrap_content"
280 285 android:text="本地售后电话"
281   - android:textColor="@color/pickerview_wheelview_textcolor_center"
  286 + android:textColor="@color/electronic_text"
282 287 android:textSize="22sp" />
283 288  
284 289 <EditText
  290 + android:id="@+id/et_edit_telphone"
285 291 android:layout_width="wrap_content"
286 292 android:layout_height="wrap_content"
287 293 android:layout_marginLeft="20dp"
288 294 android:background="@null"
289 295 android:hint="请输入"
290   - android:textColor="@color/pickerview_wheelview_textcolor_center"
  296 + android:textColor="@color/electronic_text"
291 297 android:textSize="22sp" />
292 298 </LinearLayout>
293 299  
... ... @@ -373,7 +379,6 @@
373 379 </View>
374 380  
375 381  
376   -
377 382 </LinearLayout>
378 383  
379 384 <Button
... ...
PersonalCenter/app/src/main/res/layout/activity_feedback.xml
Diff comments   View file @661a7bc
... ... @@ -75,7 +75,7 @@
75 75 android:text="@string/hint"
76 76 android:padding="20dp"
77 77 android:textSize="18sp"
78   - android:layout_height="60dp" />
  78 + android:layout_height="wrap_content" />
79 79  
80 80  
81 81  
... ...
PersonalCenter/app/src/main/res/layout/activity_main.xml
Diff comments   View file @661a7bc
... ... @@ -29,9 +29,10 @@
29 29 android:textSize="22sp" />
30 30  
31 31 <ImageView
  32 + android:id="@+id/iv_setting"
32 33 android:layout_width="wrap_content"
33 34 android:layout_height="match_parent"
34   - android:layout_marginLeft="10dp"
  35 + android:layout_marginRight="10dp"
35 36 android:layout_toLeftOf="@+id/iv_skin"
36 37 android:gravity="center_vertical"
37 38 android:padding="10dp"
... ... @@ -43,7 +44,7 @@
43 44 android:id="@+id/iv_skin"
44 45 android:layout_width="wrap_content"
45 46 android:layout_height="match_parent"
46   - android:layout_marginLeft="10dp"
  47 + android:layout_marginRight="10dp"
47 48 android:layout_toLeftOf="@+id/iv_imformatioan"
48 49 android:gravity="center_vertical"
49 50 android:padding="10dp"
... ... @@ -56,7 +57,7 @@
56 57 android:layout_width="wrap_content"
57 58 android:layout_height="match_parent"
58 59 android:layout_alignParentRight="true"
59   - android:layout_marginLeft="20dp"
  60 + android:layout_marginRight="10dp"
60 61 android:gravity="center_vertical"
61 62 android:padding="10dp"
62 63 android:src="@mipmap/fankui"
... ... @@ -76,32 +77,34 @@
76 77 android:layout_weight="1"
77 78 android:orientation="vertical">
78 79  
79   - <ImageView
80   - android:layout_width="wrap_content"
81   - android:layout_height="wrap_content"
82   - android:layout_margin="20dp"
83   - android:padding="10dp"
84   - android:src="@mipmap/card_icoc" />
85   -
86 80 <LinearLayout
87 81 android:layout_width="match_parent"
88 82 android:layout_height="wrap_content"
89   - android:gravity="center"
  83 + android:layout_marginTop="20dp"
90 84 android:orientation="horizontal">
  85 + <ImageView
  86 + android:id="@+id/iv_look_card"
  87 + android:layout_width="wrap_content"
  88 + android:layout_height="wrap_content"
  89 + android:padding="10dp"
  90 + android:layout_marginLeft="20dp"
  91 + android:src="@mipmap/card_icoc" />
91 92  
92 93 <ImageView
93 94 android:layout_width="wrap_content"
94 95 android:layout_height="wrap_content"
95   - android:layout_marginLeft="30dp"
  96 + android:layout_marginLeft="60dp"
96 97 android:src="@mipmap/header_default" />
97 98  
98 99 <TextView
99 100 android:layout_width="wrap_content"
100 101 android:layout_height="wrap_content"
101 102 android:layout_marginLeft="18dp"
  103 + android:layout_marginTop="20dp"
102 104 android:background="@drawable/corcle_blue_bg"
103 105 android:paddingLeft="5dp"
104 106 android:paddingRight="5dp"
  107 + android:gravity="center_vertical"
105 108 android:text="签到"
106 109 android:textColor="@color/login_text_blue"
107 110 android:textSize="18sp" />
... ... @@ -124,7 +127,7 @@
124 127 <ImageView
125 128 android:layout_width="wrap_content"
126 129 android:layout_height="wrap_content"
127   - android:layout_marginLeft="90dp"
  130 + android:layout_marginLeft="50dp"
128 131 android:src="@mipmap/men" />
129 132  
130 133 </LinearLayout>
... ... @@ -157,7 +160,7 @@
157 160 <View
158 161 android:layout_width="match_parent"
159 162 android:layout_height="0.7dp"
160   - android:layout_marginTop="10dp"
  163 + android:layout_marginTop="20dp"
161 164 android:background="@color/cutoff_line">
162 165  
163 166 </View>
... ... @@ -165,7 +168,7 @@
165 168 <LinearLayout
166 169 android:layout_width="match_parent"
167 170 android:layout_height="wrap_content"
168   - android:layout_marginTop="20dp"
  171 + android:layout_marginTop="30dp"
169 172 android:orientation="vertical">
170 173  
171 174 <LinearLayout
... ... @@ -198,7 +201,7 @@
198 201 <LinearLayout
199 202 android:layout_width="match_parent"
200 203 android:layout_height="wrap_content"
201   - android:layout_marginTop="20dp"
  204 + android:layout_marginTop="35dp"
202 205 android:gravity="center_vertical"
203 206 android:orientation="horizontal">
204 207  
... ... @@ -226,7 +229,7 @@
226 229 <LinearLayout
227 230 android:layout_width="match_parent"
228 231 android:layout_height="wrap_content"
229   - android:layout_marginTop="20dp"
  232 + android:layout_marginTop="35dp"
230 233 android:gravity="center_vertical"
231 234 android:orientation="horizontal">
232 235  
... ... @@ -254,7 +257,7 @@
254 257 <LinearLayout
255 258 android:layout_width="match_parent"
256 259 android:layout_height="wrap_content"
257   - android:layout_marginTop="20dp"
  260 + android:layout_marginTop="35dp"
258 261 android:gravity="center_vertical"
259 262 android:orientation="horizontal">
260 263  
... ... @@ -284,8 +287,8 @@
284 287  
285 288 <LinearLayout
286 289 android:layout_width="match_parent"
287   - android:layout_height="wrap_content"
288   - android:layout_marginTop="100dp"
  290 + android:layout_height="match_parent"
  291 + android:layout_marginTop="120dp"
289 292 android:background="@mipmap/xiaoguanggao">
290 293  
291 294 </LinearLayout>
... ... @@ -369,17 +372,19 @@
369 372 android:layout_width="0dp"
370 373 android:layout_height="wrap_content"
371 374 android:layout_marginLeft="5dp"
372   - android:layout_weight="1"
  375 + android:layout_weight="2"
373 376 android:text="个人信息"
374 377 android:textSize="22sp" />
375 378  
376 379 <TextView
  380 + android:id="@+id/tv_edit_presoninfo"
  381 + android:padding="5dp"
377 382 android:layout_width="0dp"
378 383 android:layout_height="wrap_content"
379   - android:layout_marginLeft="5dp"
380   - android:layout_weight="0.1"
  384 + android:layout_marginLeft="10dp"
  385 + android:layout_weight="0.2"
381 386 android:text="编辑"
382   - android:textSize="22sp" />
  387 + android:textSize="18sp" />
383 388  
384 389 <ImageView
385 390 android:layout_width="0dp"
... ... @@ -395,7 +400,7 @@
395 400 android:layout_width="match_parent"
396 401 android:layout_height="wrap_content"
397 402 android:layout_marginLeft="50dp"
398   - android:layout_marginTop="20dp"
  403 + android:layout_marginTop="10dp"
399 404 android:orientation="vertical">
400 405  
401 406 <LinearLayout
... ... @@ -543,7 +548,13 @@
543 548  
544 549  
545 550 </LinearLayout>
  551 + <View
  552 + android:layout_width="match_parent"
  553 + android:layout_height="0.7dp"
  554 + android:layout_marginTop="20dp"
  555 + android:background="@color/cutoff_line">
546 556  
  557 + </View>
547 558 <LinearLayout
548 559 android:layout_width="match_parent"
549 560 android:layout_height="wrap_content"
... ... @@ -567,13 +578,6 @@
567 578  
568 579 </LinearLayout>
569 580  
570   - <View
571   - android:layout_width="match_parent"
572   - android:layout_height="0.7dp"
573   - android:background="@color/cutoff_line">
574   -
575   - </View>
576   -
577 581 <LinearLayout
578 582 android:layout_width="match_parent"
579 583 android:layout_height="wrap_content"
... ...
PersonalCenter/app/src/main/res/layout/activity_ok_cardinfo.xml
Diff comments   View file @661a7bc
... ... @@ -33,7 +33,10 @@
33 33 <LinearLayout
34 34 android:layout_width="match_parent"
35 35 android:layout_height="wrap_content"
36   - android:layout_margin="20dp"
  36 + android:layout_marginTop="50dp"
  37 + android:layout_marginLeft="20dp"
  38 + android:layout_marginRight="20dp"
  39 + android:layout_marginBottom="30dp"
37 40 android:background="@mipmap/cardbackgrangd"
38 41 android:gravity="center"
39 42 android:orientation="vertical">
... ... @@ -41,7 +44,7 @@
41 44 <LinearLayout
42 45 android:layout_width="match_parent"
43 46 android:layout_height="wrap_content"
44   - android:layout_marginTop="70dp"
  47 + android:layout_marginTop="50dp"
45 48 android:gravity="center_vertical"
46 49 android:orientation="horizontal">
47 50  
... ... @@ -63,7 +66,7 @@
63 66 android:layout_marginLeft="50dp"
64 67 android:background="@null"
65 68 android:text="电子保卡"
66   - android:textColor="@color/login_text_blue"
  69 + android:textColor="@color/electronic_card"
67 70 android:textSize="22sp" />
68 71  
69 72 </LinearLayout>
... ... @@ -83,6 +86,7 @@
83 86 android:textSize="22sp" />
84 87  
85 88 <TextView
  89 + android:id="@+id/iv_card_username"
86 90 android:layout_width="wrap_content"
87 91 android:layout_height="wrap_content"
88 92 android:layout_marginLeft="80dp"
... ... @@ -115,6 +119,7 @@
115 119 android:textSize="22sp" />
116 120  
117 121 <TextView
  122 + android:id="@+id/tv_card_deviceModel"
118 123 android:layout_width="wrap_content"
119 124 android:layout_height="wrap_content"
120 125 android:layout_marginLeft="50dp"
... ... @@ -138,6 +143,7 @@
138 143 android:textSize="22sp" />
139 144  
140 145 <TextView
  146 + android:id="@+id/tv_card_adress"
141 147 android:layout_width="wrap_content"
142 148 android:layout_height="wrap_content"
143 149 android:layout_marginLeft="80dp"
... ... @@ -169,6 +175,7 @@
169 175 android:textSize="22sp" />
170 176  
171 177 <TextView
  178 + android:id="@+id/tv_card_mac"
172 179 android:layout_width="wrap_content"
173 180 android:layout_height="wrap_content"
174 181 android:layout_marginLeft="50dp"
... ... @@ -193,6 +200,7 @@
193 200 android:textSize="22sp" />
194 201  
195 202 <TextView
  203 + android:id="@+id/tv_card_time"
196 204 android:layout_width="wrap_content"
197 205 android:layout_height="wrap_content"
198 206 android:layout_marginLeft="80dp"
... ... @@ -225,6 +233,7 @@
225 233 android:textSize="22sp" />
226 234  
227 235 <TextView
  236 + android:id="@+id/tv_card_deviceNumber"
228 237 android:layout_width="wrap_content"
229 238 android:layout_height="wrap_content"
230 239 android:layout_marginLeft="50dp"
... ... @@ -248,6 +257,7 @@
248 257 android:textSize="22sp" />
249 258  
250 259 <TextView
  260 + android:id="@+id/tv_card_shopAdress"
251 261 android:layout_width="wrap_content"
252 262 android:layout_height="wrap_content"
253 263 android:layout_marginLeft="80dp"
... ... @@ -262,6 +272,7 @@
262 272 android:layout_width="match_parent"
263 273 android:layout_height="wrap_content"
264 274 android:gravity="center_vertical"
  275 + android:layout_marginBottom="30dp"
265 276 android:orientation="horizontal">
266 277  
267 278 <LinearLayout
... ... @@ -279,6 +290,7 @@
279 290 android:textSize="22sp" />
280 291  
281 292 <TextView
  293 + android:id="@+id/tv_card_phone"
282 294 android:layout_width="wrap_content"
283 295 android:layout_height="wrap_content"
284 296 android:layout_marginLeft="50dp"
... ... @@ -302,6 +314,7 @@
302 314 android:textSize="22sp" />
303 315  
304 316 <TextView
  317 + android:id="@+id/tv_card_tleNember"
305 318 android:layout_width="wrap_content"
306 319 android:layout_height="wrap_content"
307 320 android:layout_marginLeft="40dp"
... ...