diff --git a/app/build.gradle b/app/build.gradle
index 4b30b7c..19e8fe4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 26
     defaultConfig {
-        applicationId "com.mogician.cardreader"
+        applicationId "com.wolfaonliu.cardreader"
         minSdkVersion 23
         targetSdkVersion 26
         versionCode 1
-        versionName "1.2.5"
+        versionName "1.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -18,9 +18,10 @@ android {
     }
 
     android.applicationVariants.all {
-        variant -> variant.outputs.all {
-            outputFileName = "NCR_${variant.name}_v${variant.versionName}.apk"
-        }
+        variant ->
+            variant.outputs.all {
+                outputFileName = "NCR_${variant.name}_v${variant.versionName}.apk"
+            }
     }
 }
 
@@ -29,6 +30,7 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.android.support:design:26.1.0'
+    implementation 'com.android.support:support-v4:26.1.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
diff --git a/app/src/androidTest/java/com/mogician/cardreader/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/wolfaonliu/cardreader/ExampleInstrumentedTest.java
similarity index 89%
rename from app/src/androidTest/java/com/mogician/cardreader/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/wolfaonliu/cardreader/ExampleInstrumentedTest.java
index f099232..cd7525c 100644
--- a/app/src/androidTest/java/com/mogician/cardreader/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/wolfaonliu/cardreader/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 94e63e7..5e62ab6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogician.cardreader">
+    package="com.wolfaonliu.cardreader">
 
     <uses-permission android:name="android.permission.NFC" />
 
@@ -12,7 +12,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.NoActionBar">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.wolfaonliu.cardreader.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -55,6 +55,7 @@
                 android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/nfc_tech_filter" />
         </activity>
+        <activity android:name="com.wolfaonliu.cardreader.AboutActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/wolfaonliu/cardreader/AboutActivity.java b/app/src/main/java/com/wolfaonliu/cardreader/AboutActivity.java
new file mode 100644
index 0000000..a28ab34
--- /dev/null
+++ b/app/src/main/java/com/wolfaonliu/cardreader/AboutActivity.java
@@ -0,0 +1,116 @@
+package com.wolfaonliu.cardreader;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class AboutActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+
+    Toolbar toolbar;
+
+
+    private ListView mView;
+
+    private AboutAdapter mAdapter;
+
+    private RecyclerView.LayoutManager mLayoutManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+
+        toolbar = findViewById(R.id.about_toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        initData();
+        initView();
+    }
+
+
+    private void initData() {
+        mAdapter = new AboutAdapter(getSet(), this);
+    }
+
+    private ArrayList<String[]> getSet() {
+        ArrayList<String[]> settings = new ArrayList<>();
+        String[][] s = new String[4][2];
+        s[0][0] = getString(R.string.version);
+        s[0][1] = Util.getVersion(this.getApplicationContext());
+        s[1][0] = getString(R.string.developer);
+        s[1][1] = "wolfaonliu";
+        s[2][0] = getString(R.string.contact);
+        s[2][1] = "wolfaonliu@gmail.com";
+        s[3][0] = getString(R.string.github);
+        s[3][1] = "https://github.com/liuyanyi/NewcapecCardReader";
+        settings.addAll(Arrays.asList(s));
+        return settings;
+    }
+
+    private void initView() {
+        mView = findViewById(R.id.set_list);
+        // 设置adapter
+        mView.setAdapter(mAdapter);
+        mView.setOnItemClickListener(this);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        Uri uri;
+        Intent intent;
+        switch (position) {
+            case 2:
+//                uri = Uri.parse("wolfaonliu@gmail.com");
+//                intent = new Intent(Intent.ACTION_SENDTO, uri);
+////                intent.putExtra(Intent.EXTRA_SUBJECT, "Newcapec Card Reader Report");
+//                startActivity(intent);
+                showEmailDialog();
+                break;
+            case 3:
+                uri = Uri.parse("https://github.com/liuyanyi/NewcapecCardReader");
+                intent = new Intent(Intent.ACTION_VIEW, uri);
+                startActivity(intent);
+                break;
+            default:
+                break;
+        }
+//        Toast.makeText(this, "你点击了第" + position + "项", Toast.LENGTH_SHORT).show();
+    }
+
+
+    private void showEmailDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(R.string.Report)
+                .setMessage(R.string.report_atten);
+        builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                Intent email = new Intent(Intent.ACTION_SEND);
+                email.setType("message/rfc822");
+                email.putExtra(Intent.EXTRA_EMAIL, new String[]{"wolfaonliu@gmail.com"});
+                email.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + getString(R.string.report));
+                startActivity(Intent.createChooser(email, getString(R.string.email_clint)));
+            }
+        });
+        builder.setNegativeButton(R.string.no, null);
+
+        builder.show();
+    }
+}
diff --git a/app/src/main/java/com/wolfaonliu/cardreader/AboutAdapter.java b/app/src/main/java/com/wolfaonliu/cardreader/AboutAdapter.java
new file mode 100644
index 0000000..bc4edd0
--- /dev/null
+++ b/app/src/main/java/com/wolfaonliu/cardreader/AboutAdapter.java
@@ -0,0 +1,60 @@
+package com.wolfaonliu.cardreader;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+/**
+ * Created by Mogician on 2018/3/14.
+ */
+
+public class AboutAdapter extends BaseAdapter {
+
+    private ArrayList<String[]> mData;
+    private Activity activity;
+
+    private TextView setting;
+    private TextView settingsub;
+
+
+    public AboutAdapter(ArrayList<String[]> data, Activity activity) {
+        this.mData = data;
+        this.activity = activity;
+    }
+
+    @Override
+    public int getCount() {
+        return mData.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        convertView = LayoutInflater.from(activity).inflate(R.layout.about_item, parent, false);
+
+        setting = convertView.findViewById(R.id.setting);
+        settingsub = convertView.findViewById(R.id.settingsub);
+
+//
+        setting.setText(mData.get(position)[0]);
+        settingsub.setText(mData.get(position)[1]);
+        return convertView;
+
+    }
+
+
+}
diff --git a/app/src/main/java/com/mogician/cardreader/CardInfo.java b/app/src/main/java/com/wolfaonliu/cardreader/CardInfo.java
similarity index 90%
rename from app/src/main/java/com/mogician/cardreader/CardInfo.java
rename to app/src/main/java/com/wolfaonliu/cardreader/CardInfo.java
index d425b44..5667e45 100644
--- a/app/src/main/java/com/mogician/cardreader/CardInfo.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/CardInfo.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.app.Activity;
 import android.graphics.Color;
@@ -95,7 +95,7 @@ public void setPersonId(String personId) {
     public void setCardBalance(String cardBalance) {
         if (cardBalance != null)
             isNewcapecCard = true;
-        this.cardBalance = cardBalance + "元";
+        this.cardBalance = cardBalance + mainActivity.getString(R.string.yuan);
     }
 
     public void setStudentDept(String studentDept) {
@@ -114,13 +114,13 @@ public void onFinish(boolean isFull) {
         pgBar.setVisibility(View.GONE);
         if (!isFull) {
             //未能复现……
-            atten.setText("警告,读取内容不全，请重新放置卡片");
+            atten.setText(mainActivity.getString(R.string.reading_alert));
             pgI.setColorFilter(Color.parseColor("#259b24"));
         } else if (isNewcapecCard) {
-            atten.setText("成功");
+            atten.setText(mainActivity.getString(R.string.success));
             pgI.setColorFilter(Color.parseColor("#259b24"));
         } else {
-            atten.setText("失败,非校园卡");
+            atten.setText(mainActivity.getString(R.string.failed));
             pgI.setColorFilter(Color.parseColor("#e51c23"));
         }
     }
@@ -146,7 +146,7 @@ public void showInLog() {
 
     public boolean show() {
         if (isNewcapecCard) {
-            isCard.setText("校园卡");
+            isCard.setText(mainActivity.getString(R.string.isStuCard));
 
             name.setText(studentName);
 
@@ -164,7 +164,7 @@ public boolean show() {
 
                 dealCard.setVisibility(View.VISIBLE);
                 // 设置adapter
-                mAdapter = new DealAdapter(getTradeList());
+                mAdapter = new DealAdapter(getTradeList(), mainActivity);
                 mRecyclerView.setAdapter(mAdapter);
                 mRecyclerView.addItemDecoration(new ItemDivider(mainActivity, LinearLayoutManager.VERTICAL));
             }
@@ -173,7 +173,7 @@ public boolean show() {
                 return false;
 
         } else {
-            isCard.setText("非校园卡");
+            isCard.setText(mainActivity.getString(R.string.unsupport));
 
             hardware.setText(hardwareId);
 
diff --git a/app/src/main/java/com/mogician/cardreader/CardReader.java b/app/src/main/java/com/wolfaonliu/cardreader/CardReader.java
similarity index 98%
rename from app/src/main/java/com/mogician/cardreader/CardReader.java
rename to app/src/main/java/com/wolfaonliu/cardreader/CardReader.java
index c8396ad..8b0f87d 100644
--- a/app/src/main/java/com/mogician/cardreader/CardReader.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/CardReader.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -49,7 +49,7 @@ public static CardInfo readCard(Activity activity, Intent intent) {
             if (transceive != null && g.c(transceive)) {
                 transceive = isoDep.transceive(g.a(fInts.d));
                 if (transceive == null || !g.c(transceive)) {
-                    Util.aToast("读卡失败！", activity);
+                    Util.aToast(activity.getString(R.string.read_failed), activity);
                 } else {
                     byte[] a;
 
@@ -96,7 +96,7 @@ public static CardInfo readCard(Activity activity, Intent intent) {
                         a = g.a(transceive);
                         g.a(a, 0, transceive, 0, transceive.length - 2);
                         action = g.a(a, 0, a.length, "GB18030").trim();
-                        Log.d("***", action);
+//                        Log.d("***", action);
                         if (Util.d(action) || Util.a(action) || action.contains("000000")) {
 //                                    bVar.d(action);
 //                            Log.d("学院******", action);
diff --git a/app/src/main/java/com/mogician/cardreader/DealAdapter.java b/app/src/main/java/com/wolfaonliu/cardreader/DealAdapter.java
similarity index 65%
rename from app/src/main/java/com/mogician/cardreader/DealAdapter.java
rename to app/src/main/java/com/wolfaonliu/cardreader/DealAdapter.java
index 9f08382..5671740 100644
--- a/app/src/main/java/com/mogician/cardreader/DealAdapter.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/DealAdapter.java
@@ -1,5 +1,6 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
+import android.app.Activity;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,9 +16,11 @@
 public class DealAdapter extends RecyclerView.Adapter<DealAdapter.ViewHolder> {
 
     private ArrayList<TradingRecordInfo> mData;
+    private Activity activity;
 
-    public DealAdapter(ArrayList<TradingRecordInfo> data) {
+    public DealAdapter(ArrayList<TradingRecordInfo> data, Activity activity) {
         this.mData = data;
+        this.activity = activity;
     }
 
     public void updateData(ArrayList<TradingRecordInfo> data) {
@@ -37,10 +40,20 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     public void onBindViewHolder(ViewHolder holder, int position) {
         // 绑定数据
         String m = mData.get(position).getTradingMoney();
-        String t = mData.get(position).getTradingType();
+        int t = mData.get(position).getTradingType();
         holder.time.setText(mData.get(position).getTradingDateTime());
         holder.money.setText(m);
-        holder.type.setText(t);
+        switch (t) {
+            case 2:
+                holder.type.setText(activity.getString(R.string.recharge));
+                break;
+            case 6:
+                holder.type.setText(activity.getString(R.string.consumption));
+                break;
+            default:
+                holder.type.setText(t);
+                break;
+        }
     }
 
     @Override
@@ -56,9 +69,9 @@ public static class ViewHolder extends RecyclerView.ViewHolder {
 
         public ViewHolder(View itemView) {
             super(itemView);
-            type = (TextView) itemView.findViewById(R.id.type);
-            money = (TextView) itemView.findViewById(R.id.deal);
-            time = (TextView) itemView.findViewById(R.id.time);
+            type = itemView.findViewById(R.id.type);
+            money = itemView.findViewById(R.id.deal);
+            time = itemView.findViewById(R.id.time);
         }
     }
 }
diff --git a/app/src/main/java/com/mogician/cardreader/ItemDivider.java b/app/src/main/java/com/wolfaonliu/cardreader/ItemDivider.java
similarity index 99%
rename from app/src/main/java/com/mogician/cardreader/ItemDivider.java
rename to app/src/main/java/com/wolfaonliu/cardreader/ItemDivider.java
index 5d320e4..ca665bc 100644
--- a/app/src/main/java/com/mogician/cardreader/ItemDivider.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/ItemDivider.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/com/mogician/cardreader/MainActivity.java b/app/src/main/java/com/wolfaonliu/cardreader/MainActivity.java
similarity index 90%
rename from app/src/main/java/com/mogician/cardreader/MainActivity.java
rename to app/src/main/java/com/wolfaonliu/cardreader/MainActivity.java
index 3625792..64726ef 100644
--- a/app/src/main/java/com/mogician/cardreader/MainActivity.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/MainActivity.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.app.PendingIntent;
 import android.content.Intent;
@@ -71,10 +71,11 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         } else if (id == R.id.nav_share) {
             Intent textIntent = new Intent(Intent.ACTION_SEND);
             textIntent.setType("text/plain");
-            textIntent.putExtra(Intent.EXTRA_TEXT, "Newcapec Card Reader : https://github.com/liuyanyi/NewcapecCardReader");
-            startActivity(Intent.createChooser(textIntent, "分享Newcapec Card Reader"));
+            textIntent.putExtra(Intent.EXTRA_TEXT, getString(R.string.app_name) + " : https://www.coolapk.com/apk/com.wolfaonliu.cardreader");
+            startActivity(Intent.createChooser(textIntent, getString(R.string.share) + getString(R.string.app_name)));
         } else if (id == R.id.nav_about) {
-
+            Intent intent = new Intent(MainActivity.this, AboutActivity.class);
+            startActivity(intent);
         }
 
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
diff --git a/app/src/main/java/com/mogician/cardreader/TradingRecordInfo.java b/app/src/main/java/com/wolfaonliu/cardreader/TradingRecordInfo.java
similarity index 74%
rename from app/src/main/java/com/mogician/cardreader/TradingRecordInfo.java
rename to app/src/main/java/com/wolfaonliu/cardreader/TradingRecordInfo.java
index ec37cda..317f8da 100644
--- a/app/src/main/java/com/mogician/cardreader/TradingRecordInfo.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/TradingRecordInfo.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.support.annotation.NonNull;
 
@@ -11,7 +11,7 @@ public class TradingRecordInfo implements Serializable, Comparable<TradingRecord
     private static final long serialVersionUID = -6533154177080647539L;
     private String tradingDateTime;
     private String tradingMoney;
-    private String tradingType;
+    private int tradingType;
 
     public int compareTo(@NonNull TradingRecordInfo tradingRecordInfo) {
         return tradingRecordInfo.getTradingDateTime().compareTo(this.tradingDateTime);
@@ -25,7 +25,7 @@ public String getTradingMoney() {
         return this.tradingMoney;
     }
 
-    public String getTradingType() {
+    public int getTradingType() {
         return this.tradingType;
     }
 
@@ -38,16 +38,8 @@ public void setTradingMoney(long j) {
     }
 
     public void setTradingType(int i) {
-        switch (i) {
-            case 6:
-                this.tradingType = "消费";
-                break;
-            case 2:
-                this.tradingType = "充值";
-                break;
-            default:
-                this.tradingType = String.valueOf(i);
-        }
 
+        this.tradingType = i;
     }
+
 }
diff --git a/app/src/main/java/com/mogician/cardreader/Util.java b/app/src/main/java/com/wolfaonliu/cardreader/Util.java
similarity index 80%
rename from app/src/main/java/com/mogician/cardreader/Util.java
rename to app/src/main/java/com/wolfaonliu/cardreader/Util.java
index 6443d6f..7a45883 100644
--- a/app/src/main/java/com/mogician/cardreader/Util.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/Util.java
@@ -1,6 +1,9 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.widget.Toast;
 
 import java.util.regex.Pattern;
@@ -82,4 +85,19 @@ public static boolean g(String str) {
         return !(str == null || str.trim().equals("") || str.equalsIgnoreCase("null"));
     }
 
+    public static String getVersion(Context context) {
+        String ver = "";
+        try {
+            PackageManager packageManager = context.getPackageManager();
+            PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), 0);
+            ver = packageInfo.versionName;
+            if (ver == "" || ver.length() <= 0) {
+                return "";
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return ver;
+    }
+
 }
diff --git a/app/src/main/java/com/mogician/cardreader/e.java b/app/src/main/java/com/wolfaonliu/cardreader/e.java
similarity index 97%
rename from app/src/main/java/com/mogician/cardreader/e.java
rename to app/src/main/java/com/wolfaonliu/cardreader/e.java
index 59050d1..58ea357 100644
--- a/app/src/main/java/com/mogician/cardreader/e.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/e.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 //TODO 工具类更名+整理
 public class e {
diff --git a/app/src/main/java/com/mogician/cardreader/fInts.java b/app/src/main/java/com/wolfaonliu/cardreader/fInts.java
similarity index 97%
rename from app/src/main/java/com/mogician/cardreader/fInts.java
rename to app/src/main/java/com/wolfaonliu/cardreader/fInts.java
index 20ba14a..2141f8e 100644
--- a/app/src/main/java/com/mogician/cardreader/fInts.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/fInts.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 /**
  * Created by Mogician on 2018/3/12.
diff --git a/app/src/main/java/com/mogician/cardreader/g.java b/app/src/main/java/com/wolfaonliu/cardreader/g.java
similarity index 98%
rename from app/src/main/java/com/mogician/cardreader/g.java
rename to app/src/main/java/com/wolfaonliu/cardreader/g.java
index 1591b9f..89eead4 100644
--- a/app/src/main/java/com/mogician/cardreader/g.java
+++ b/app/src/main/java/com/wolfaonliu/cardreader/g.java
@@ -1,4 +1,4 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 
 //TODO 工具类更名
diff --git a/app/src/main/res/layout/about_item.xml b/app/src/main/res/layout/about_item.xml
new file mode 100644
index 0000000..f8babb8
--- /dev/null
+++ b/app/src/main/res/layout/about_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="75dp">
+
+    <Space
+        android:layout_width="60sp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/setting"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:textColor="@android:color/black"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/settingsub"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:textColor="@android:color/darker_gray"
+            android:textSize="16sp" />
+
+    </LinearLayout>
+
+    <Space
+        android:layout_width="60sp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..962b667
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:openDrawer="start">
+
+
+    <include
+        layout="@layout/app_bar_about"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/app_bar_about.xml b/app/src/main/res/layout/app_bar_about.xml
new file mode 100644
index 0000000..b28d911
--- /dev/null
+++ b/app/src/main/res/layout/app_bar_about.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.wolfaonliu.cardreader.AboutActivity">
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="@style/AppTheme.AppBarOverlay">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/about_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:title="@string/about"
+            app:popupTheme="@style/AppTheme.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_about" />
+
+
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index f922221..42d707b 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.mogician.cardreader.MainActivity">
+    tools:context="com.wolfaonliu.cardreader.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_about.xml b/app/src/main/res/layout/content_about.xml
new file mode 100644
index 0000000..8841ec9
--- /dev/null
+++ b/app/src/main/res/layout/content_about.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="com.wolfaonliu.cardreader.AboutActivity"
+    tools:showIn="@layout/app_bar_about">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?android:attr/selectableItemBackground"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="20sp"
+                android:orientation="vertical"
+                tools:layout_editor_absoluteX="20dp"
+                tools:layout_editor_absoluteY="20dp">
+
+                <ImageView
+                    android:id="@+id/imageView2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10sp"
+                    app:srcCompat="@mipmap/ic_launcher_round" />
+
+                <TextView
+                    android:id="@+id/textView4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-condensed"
+                    android:gravity="bottom|center_vertical|center"
+                    android:text="@string/app_name"
+                    android:textSize="18sp"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/textView6"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/intho"
+                    android:textAlignment="center" />
+
+                <TextView
+                    android:id="@+id/textView7"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/aftertest"
+                    android:textAlignment="center" />
+
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <View
+            android:id="@+id/view3"
+            android:layout_width="match_parent"
+            android:layout_height="1.2dp"
+            android:layout_marginTop="8sp"
+            android:background="?attr/colorButtonNormal" />
+
+        <ListView
+            android:id="@+id/set_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:footerDividersEnabled="true"
+            android:headerDividersEnabled="true"></ListView>
+
+        <View
+            android:id="@+id/view2"
+            android:layout_width="match_parent"
+            android:layout_height="1.2dp"
+            android:layout_marginBottom="20sp"
+            android:background="?attr/colorButtonNormal" />
+    </LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 36802ca..03a9812 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="com.mogician.cardreader.MainActivity"
+    tools:context="com.wolfaonliu.cardreader.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
 
@@ -74,8 +74,8 @@
                 <View
                     android:id="@+id/view"
                     android:layout_width="match_parent"
-                    android:layout_height="1.5dp"
-                    android:background="@android:color/darker_gray" />
+                    android:layout_height="1.2dp"
+                    android:background="?attr/colorButtonNormal" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -313,8 +313,8 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="1.5dp"
-                    android:background="@android:color/darker_gray" />
+                    android:layout_height="1.2dp"
+                    android:background="?attr/colorButtonNormal" />
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/dealList"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index e8a434d..de340b9 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -25,7 +25,7 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-condensed"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="@string/full_name"
+        android:text="@string/app_name"
         android:textColor="@color/cardview_light_background"
         android:textSize="18sp"
         android:textStyle="bold" />
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 463dc29..df36b53 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -9,19 +9,19 @@
             android:checkable="true"
             android:checked="true"
             android:icon="@drawable/ic_menu_nfc"
-            android:title="读卡" />
+            android:title="@string/readCard" />
     </group>
 
-    <item android:title="其他">
+    <item android:title="@string/other">
         <menu>
             <item
                 android:id="@+id/nav_share"
                 android:icon="@drawable/ic_menu_share"
-                android:title="分享" />
+                android:title="@string/share" />
             <item
                 android:id="@+id/nav_about"
                 android:icon="@drawable/ic_menu_info"
-                android:title="关于" />
+                android:title="@string/about" />
         </menu>
     </item>
 
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000..16e3a2c
--- /dev/null
+++ b/app/src/main/res/values-en/strings.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Newcapec Card Reader</string>
+    <string name="full_name">Newcapec Card Reader</string>
+    <string name="attention">Place the card in the reader area</string>
+    <string name="card_cate">Category</string>
+    <string name="name">Name</string>
+    <string name="student_Id">Stu ID</string>
+    <string name="balance">Balance</string>
+    <string name="hardware_Id">Hardware ID</string>
+    <string name="Dept">Department</string>
+    <string name="pId">Preson ID</string>
+    <string name="deal_List">Deal list</string>
+    <string name="type_demo">Type</string>
+    <string name="time_demo">Time</string>
+    <string name="deal_Demo">Deal</string>
+    <string name="background_descript">background</string>
+    <string name="nfc_icon_descript">NFC_Icon</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="read_failed">Failed!</string>
+    <string name="reading_alert">Warning, please re-place the card</string>
+    <string name="success">Success</string>
+    <string name="failed">Failed,unsupported card</string>
+    <string name="isStuCard">Newcapec Card</string>
+    <string name="unsupport">Unsupported card</string>
+    <string name="yuan">yuan</string>
+    <string name="consumption">Consumption</string>
+    <string name="recharge">Recharge</string>
+    <string name="share">Share </string>
+    <string name="readCard">Read Card</string>
+    <string name="about">About</string>
+    <string name="other">Other</string>
+    <string name="title_activity_about">About</string>
+    <string name="version">Version</string>
+    <string name="developer">Developer</string>
+    <string name="github">Github</string>
+    <string name="contact">Contact</string>
+    <string name="Report">Email Report</string>
+    <string name="report_atten">Feedback can be provided to developers via email, which will evoke email application.</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="email_clint">Choose an Email Client</string>
+    <string name="report">" Report"</string>
+    <string name="intho">In theory, it applies to all campus cards provided by the Newcapec Company.</string>
+    <string name="aftertest">Only tested on campus card of NEU.</string>
+    <string name="donate">Donate</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..f4a9579
--- /dev/null
+++ b/app/src/main/res/values-zh/strings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+
+    <string name="background_descript">background</string>
+    <string name="nfc_icon_descript">NFC_Icon</string>
+
+    <string name="app_name">新开普读卡器</string>
+    <string name="full_name">新开普读卡器</string>
+    <string name="attention">将卡片放置到读卡区</string>
+    <string name="card_cate">卡类型</string>
+    <string name="name">姓名</string>
+    <string name="student_Id">学号</string>
+    <string name="balance">余额</string>
+    <string name="hardware_Id">硬件ID</string>
+    <string name="Dept">学院</string>
+    <string name="pId">身份证号</string>
+    <string name="deal_List">交易记录</string>
+    <string name="type_demo">Type</string>
+    <string name="time_demo">Time</string>
+    <string name="deal_Demo">Deal</string>
+    <string name="read_failed">读卡失败！</string>
+    <string name="reading_alert">警告,请重新放置卡片</string>
+    <string name="failed">失败,不支持的卡片</string>
+    <string name="success">成功</string>
+    <string name="isStuCard">校园卡</string>
+    <string name="unsupport">不支持的卡片</string>
+    <string name="yuan">元</string>
+    <string name="consumption">消费</string>
+    <string name="recharge">充值</string>
+    <string name="share">分享</string>
+    <string name="readCard">读卡</string>
+    <string name="about">关于</string>
+    <string name="other">其他</string>
+    <string name="title_activity_about">关于</string>
+    <string name="version">版本号</string>
+    <string name="developer">开发者</string>
+    <string name="github">Github</string>
+    <string name="donate">捐赠</string>
+    <string name="contact">联系方式</string>
+    <string name="Report">邮件反馈</string>
+    <string name="report_atten">可以通过邮件向开发者反馈，该操作会唤起邮件应用。</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="email_clint">选择邮件客户端</string>
+    <string name="report">反馈</string>
+    <string name="intho">理论上适用于所有新开普公司提供的校园卡</string>
+    <string name="aftertest">目前仅在东北大学校园卡测试通过</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c57372..563ace7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,12 +1,10 @@
 <resources>
-    <string name="app_name">Newcapec Card Reader</string>
-    <string name="title_activity_main2">Main2Activity</string>
+    <string name="app_name">新开普读卡器</string>
 
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
-    <string name="action_settings">Settings</string>
-    <string name="full_name">Newcapec Card Reader</string>
+    <string name="full_name">新开普读卡器</string>
     <string name="background_descript">background</string>
     <string name="nfc_icon_descript">NFC_Icon</string>
     <string name="attention">将卡片放置到读卡区</string>
@@ -21,4 +19,33 @@
     <string name="type_demo">Type</string>
     <string name="time_demo">Time</string>
     <string name="deal_Demo">Deal</string>
+    <string name="read_failed">读卡失败！</string>
+    <string name="reading_alert">警告,请重新放置卡片</string>
+    <string name="success">成功</string>
+    <string name="failed">失败,不支持的卡片</string>
+    <string name="isStuCard">校园卡</string>
+    <string name="unsupport">不支持的卡片</string>
+    <string name="yuan">元</string>
+    <string name="consumption">消费</string>
+    <string name="recharge">充值</string>
+    <string name="share">分享</string>
+    <string name="readCard">读卡</string>
+    <string name="about">关于</string>
+    <string name="title_activity_about">关于</string>
+
+    <string name="other">其他</string>
+    <string name="version">版本号</string>
+    <string name="developer">开发者</string>
+    <string name="github">Github</string>
+    <string name="donate">捐赠</string>
+    <string name="contact">联系方式</string>
+    <string name="Report">邮件反馈</string>
+    <string name="report_atten">可以通过邮件向开发者反馈，该操作会唤起邮件应用。</string>
+    <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="email_clint">选择邮件客户端</string>
+    <string name="report">反馈</string>
+    <string name="intho">理论上适用于所有新开普公司提供的校园卡。</string>
+    <string name="aftertest">目前仅在东北大学校园卡测试通过。</string>
+
 </resources>
diff --git a/app/src/test/java/com/mogician/cardreader/ExampleUnitTest.java b/app/src/test/java/com/wolfaonliu/cardreader/ExampleUnitTest.java
similarity index 81%
rename from app/src/test/java/com/mogician/cardreader/ExampleUnitTest.java
rename to app/src/test/java/com/wolfaonliu/cardreader/ExampleUnitTest.java
index 27c16e5..efe7615 100644
--- a/app/src/test/java/com/mogician/cardreader/ExampleUnitTest.java
+++ b/app/src/test/java/com/wolfaonliu/cardreader/ExampleUnitTest.java
@@ -1,8 +1,8 @@
-package com.mogician.cardreader;
+package com.wolfaonliu.cardreader;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).