diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8774759..cacda6b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5bcc28e..0e4eb55 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/Ytzh_Android.iml" filepath="$PROJECT_DIR$/Ytzh_Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/jsonrpc/jsonrpc.iml" filepath="$PROJECT_DIR$/jsonrpc/jsonrpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ytzh_project.iml" filepath="$PROJECT_DIR$/ytzh_project.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 65b63ba..9db4e73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -184,6 +184,9 @@
             android:screenOrientation="portrait" />
         <activity android:name=".work.Fowl.FowlActivity"
             android:screenOrientation="portrait" />
+
+        <activity android:name=".me.XiugaiMimaActivity"
+            android:screenOrientation="portrait" />
         <!-- 设置竖屏扫码 -->
         <activity
             android:name=".work.scan.ScanActivity"
diff --git a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
index e2b25e4..5f9d42e 100644
--- a/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
+++ b/app/src/main/java/com/qhclh/ytzh/home/RpcUrl.java
@@ -138,4 +138,7 @@ public class RpcUrl {
 
     public static String QueryHatchingStoreDetails = "/MainSystem/B3_ZhongHui/Rpcs/HatchDayReportRpc/QueryHatchingStoreDetails";
     public static String QueryHatchingStoreDetails_fanhui = "/MainSystem/B3_ZhongHui/Rpcs/HatchDayInfo";
+
+    ///< 修改密码
+    public static String ChangePassword = "/MainSystem/MainSystem/Rpcs/UserRpc/ChangePassword";
 }
diff --git a/app/src/main/java/com/qhclh/ytzh/me/SettingActivity.java b/app/src/main/java/com/qhclh/ytzh/me/SettingActivity.java
index fdc4ebd..bbfcc7c 100644
--- a/app/src/main/java/com/qhclh/ytzh/me/SettingActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/me/SettingActivity.java
@@ -1,6 +1,7 @@
 package com.qhclh.ytzh.me;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
@@ -18,8 +19,8 @@ import butterknife.OnClick;
 
 public class SettingActivity extends BaseActivity {
 
-    @BindView(R.id.tv_phoneNumber)
-    TextView tvPhoneNumber;
+    @BindView(R.id.tv_changepsw)
+    TextView tv_changepsw;
     @BindView(R.id.tv_logout)
     TextView tv_logout;
     @BindView(R.id.tv_toolbar_title)
@@ -90,10 +91,11 @@ public class SettingActivity extends BaseActivity {
         ButterKnife.bind(this);
     }
 
-    @OnClick({R.id.tv_phoneNumber, R.id.tv_logout})
+    @OnClick({R.id.tv_changepsw, R.id.tv_logout})
     public void onViewClicked(View view) {
         switch (view.getId()) {
-            case R.id.tv_phoneNumber:
+            case R.id.tv_changepsw:
+                startActivity(new Intent(SettingActivity.this,XiugaiMimaActivity.class));
                 break;
             case R.id.tv_logout:
                 ClickBtn3();
diff --git a/app/src/main/java/com/qhclh/ytzh/me/XiugaiMimaActivity.java b/app/src/main/java/com/qhclh/ytzh/me/XiugaiMimaActivity.java
new file mode 100644
index 0000000..2929863
--- /dev/null
+++ b/app/src/main/java/com/qhclh/ytzh/me/XiugaiMimaActivity.java
@@ -0,0 +1,90 @@
+package com.qhclh.ytzh.me;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+
+import com.qhclh.ytzh.R;
+import com.qhclh.ytzh.base.BaseActivity;
+import com.qhclh.ytzh.home.RpcUrl;
+import com.qhclh.ytzh.login.LoginActivity;
+import com.qhclh.ytzh.tasks.ViewOnClickTask;
+
+import org.forks.jsonrpc.JsonRpcResult;
+import org.forks.jsonrpc.RpcFacade;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by 青花瓷 on 2017/8/28.
+ */
+
+public class XiugaiMimaActivity extends BaseActivity {
+    @BindView(R.id.toolbar)
+    Toolbar mToolbar;
+    @BindView(R.id.edit_jiumima)
+    EditText edit_jiumima;
+    @BindView(R.id.edit_xinmima)
+    EditText edit_xinmima;
+    @BindView(R.id.xiugaimima_sure)
+    Button xiugaimima_sure;
+    private String jiumima, xinmima;
+
+    @Override
+    protected int setLayoutId() {
+        return R.layout.act_xiugaimima;
+    }
+
+    @Override
+    protected void initView() {
+        initToolbar(mToolbar, getString(R.string.xiugaimima), new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+
+
+    @Override
+    protected void initData() {
+
+    }
+
+    @Override
+    protected void initOper() {
+
+    }
+
+    @OnClick(R.id.xiugaimima_sure)
+    public void OnClick(View view) {
+        jiumima = edit_jiumima.getText().toString().trim();
+        xinmima = edit_xinmima.getText().toString().trim();
+        if (xinmima.length()<6){
+            showToast("请设置6位以上密码");
+            return;
+        }
+        ViewOnClickTask xiugaiTask = new ViewOnClickTask(this, "加载中...") {
+            @Override
+            protected void successUI() {
+                showToast("修改成功");
+                startActivity(new Intent(XiugaiMimaActivity.this, LoginActivity.class));
+                finishAll();
+            }
+
+            @Override
+            public Object call() throws Exception {
+                JsonRpcResult rpcObj = RpcFacade.rpcCall(RpcUrl.ChangePassword, jiumima, xinmima);
+                return null;
+            }
+        };
+        xiugaiTask.execute();
+    }
+}
diff --git a/app/src/main/res/drawable/bg_green_btn_normal.xml b/app/src/main/res/drawable/bg_green_btn_normal.xml
new file mode 100644
index 0000000..62a52c2
--- /dev/null
+++ b/app/src/main/res/drawable/bg_green_btn_normal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/greene60b9343"/>
+    <corners android:radius="@dimen/px_8"/>
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="@color/greene60b9343"/>
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_green_btn_pressed.xml b/app/src/main/res/drawable/bg_green_btn_pressed.xml
new file mode 100644
index 0000000..d301dc9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_green_btn_pressed.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/colorPrimary"/>
+    <corners android:radius="@dimen/px_8"/>
+    <stroke
+        android:width="@dimen/dp_1"
+        android:color="@color/colorPrimary"/>
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_red_bt_selector.xml b/app/src/main/res/drawable/bg_red_bt_selector.xml
new file mode 100644
index 0000000..a72dee7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_red_bt_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/bg_green_btn_pressed"/>
+    <item android:state_pressed="false" android:drawable="@drawable/bg_green_btn_normal"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_xiugaimima.xml b/app/src/main/res/layout/act_xiugaimima.xml
new file mode 100644
index 0000000..ab5dc6f
--- /dev/null
+++ b/app/src/main/res/layout/act_xiugaimima.xml
@@ -0,0 +1,74 @@
+<?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="match_parent"
+    android:background="@color/greyeee"
+    android:orientation="vertical">
+
+    <include layout="@layout/include_tool_bar"></include>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/jiumima" />
+
+        <EditText
+            android:id="@+id/edit_jiumima"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="3"
+            android:digits="@string/filter_vcode"
+            android:inputType="number"
+            android:maxLength="12"
+            android:maxLines="1" />
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:orientation="horizontal"
+        android:padding="10dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/xinmima" />
+
+        <EditText
+            android:id="@+id/edit_xinmima"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="3"
+            android:digits="@string/filter_vcode"
+            android:inputType="number"
+            android:maxLength="12"
+            android:maxLines="1" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/xiugaimima_sure"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_50"
+        android:layout_margin="@dimen/dp_10"
+        android:background="@drawable/bg_red_bt_selector"
+        android:text="@string/xiugai"
+        android:textColor="@color/white"
+        android:textSize="@dimen/text_size_20" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 4523104..40bcff1 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -19,7 +19,7 @@
             android:orientation="vertical">
 
             <TextView
-                android:id="@+id/tv_phoneNumber"
+                android:id="@+id/tv_changepsw"
                 android:layout_width="match_parent"
                 android:layout_height="47dp"
                 android:drawablePadding="10dp"
@@ -27,7 +27,7 @@
                 android:paddingLeft="12dp"
                 android:paddingRight="12dp"
                 android:text="修改密码"
-                android:visibility="gone"
+                android:visibility="visible"
                 android:drawableRight="@drawable/more_icon"
                 android:textSize="@dimen/text_size_18" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 734096d..c20d0cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -90,4 +90,9 @@
     <string name="saomajilv">扫码记录</string>
     <string name="guobandanluru">过磅单录入</string>
     <string name="guobandanliebiao">过磅单列表</string>
+    <string name="jiumima">旧密码：</string>
+    <string name="xinmima">新密码：</string>
+    <string name="filter_vcode">0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
+    <string name="xiugai">修改</string>
+    <string name="xiugaimima">修改密码</string>
 </resources>