个人注册界面UI与逻辑完成+MD5加密处理

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/PersonalRegActivity.java

@@ -10,6 +10,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.lidroid.xutils.ViewUtils;
@@ -22,6 +23,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
+import com.xzjmyk.pm.activity.util.Md5Util;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
@@ -55,6 +57,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
     private TextView to_login_tv;
     private int male_log = 1;
     private long bir_Timestamp = 1489141231;
+    private String md5_password;
     private Handler rHandler = new Handler(){
         @Override
         public void handleMessage(Message msg) {
@@ -64,6 +67,20 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
                 case 0x01:
                     if (!StringUtils.isEmpty(result)){
                         Log.i("0x01result", result);
+                       /* {
+                            "data": {
+                            "access_token": "16f496d7e0434ce3bd22a9e150188c93",
+                                    "expires_in": 604800,
+                                    "name": "",
+                                    "nickname": "涂抹",
+                                    "userId": 115162
+                        },
+                            "resultCode": 1
+                        }*/
+                        if (result.contains("resultCode") && JSON.parseObject(result).getInteger("resultCode") == 1){
+                            Toast.makeText(ct,"注册成功",Toast.LENGTH_LONG).show();
+                            finish();
+                        }
                     }
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
@@ -78,6 +95,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
             }
         }
     };
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -113,6 +131,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
                 registerJudge();
                 break;
             case R.id.to_login_tv:
+                finish();
                 break;
         }
 
@@ -120,22 +139,23 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     private void registerJudge() {
         if (StringUtils.isEmpty(phone_et.getText().toString())){
-            ToastMessage("请输入手机号");
+            ToastMessage(getString(R.string.input_phone_number));
             return;
         }
 
         if (StringUtils.isEmpty(password_et.getText().toString())){
-            ToastMessage("请输入密码");
+            ToastMessage(getString(R.string.please_input_password));
             return;
         }
 
+        md5_password = Md5Util.toMD5(password_et.getText().toString());
         if (StringUtils.isEmpty(name_et.getText().toString())){
-            ToastMessage("请输入姓名");
+            ToastMessage(getString(R.string.input_name));
             return;
         }
 
         if (StringUtils.isEmpty(person_sign_et.getText().toString())){
-            ToastMessage("请输入个性签名");
+            ToastMessage(getString(R.string.input_person_sign));
             return;
         }
         doRegiter();
@@ -144,11 +164,12 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     private void doRegiter() {
         progressDialog.dismiss();
-        register_btn.setEnabled(false);
-        String url = Constants.getAppBaseUrl(getApplicationContext()) + "user/appRegister";
+//        register_btn.setEnabled(false);
+//        String url = Constants.getAppBaseUrl(getApplicationContext()) + "user/appRegister";
+        String url = "http://113.105.74.140:8092/" + "user/appRegister";
         Map<String, Object> params = new HashMap<>();
         params.put("telephone",phone_et.getText().toString());
-        params.put("password",password_et.getText().toString());
+        params.put("password",md5_password);
         params.put("userType",0);
         params.put("companyId",0);
         params.put("nickname",name_et.getText().toString());
@@ -163,7 +184,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     private void showSelectBirthdayDialog() {
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.YEAR_MONTH_DAY);
-        picker.setRange(1900, CalendarUtils.getCurrentYear());
+        picker.setRange(1960, CalendarUtils.getCurrentYear());
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {

WeiChat/src/main/res/layout/personal_reg_activity.xml

@@ -10,7 +10,7 @@
         android:textSize="18sp"
         android:textColor="@color/white"
         android:gravity="center"
-        android:text="个人注册"
+        android:text="@string/person_register"
         android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="35dp"
@@ -41,7 +41,7 @@
                 android:id="@+id/phone_et"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:hint="手机号"
+                android:hint="@string/phone_number"
                 android:background="@null"
                 android:gravity="center_vertical"
                 android:paddingLeft="80dp"
@@ -75,7 +75,7 @@
                 android:id="@+id/password_et"
                 android:layout_width="match_parent"
                 android:layout_height="40dp"
-                android:hint="密码"
+                android:hint="@string/rpassword"
                 android:background="@null"
                 android:gravity="center_vertical"
                 android:paddingLeft="80dp"
@@ -109,7 +109,7 @@
             android:id="@+id/name_et"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:hint="姓名"
+            android:hint="@string/name"
             android:background="@null"
             android:gravity="center_vertical"
             android:paddingLeft="80dp"
@@ -142,7 +142,7 @@
             android:id="@+id/male_et"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:hint="性别"
+            android:hint="@string/user_sex"
             android:background="@null"
             android:gravity="center_vertical"
             android:paddingLeft="80dp"
@@ -175,7 +175,7 @@
             android:id="@+id/birthday_et"
             android:layout_width="match_parent"
             android:layout_height="40dp"
-            android:hint="出生日期"
+            android:hint="@string/birthday"
             android:background="@null"
             android:gravity="center_vertical"
             android:paddingLeft="80dp"
@@ -203,7 +203,7 @@
             android:id="@+id/person_sign_et"
             android:layout_width="match_parent"
             android:layout_height="65dp"
-            android:hint="请输入个性签名"
+            android:hint="@string/input_person_sign"
             android:background="@null"
             android:textColorHint="@color/white"
             android:gravity="left|top"
@@ -230,7 +230,7 @@
                 android:padding="10dp"
                 android:textColor="@color/black"
                 android:textSize="@dimen/text_main"
-                android:text="注册"
+                android:text="@string/register"
                 android:background="@drawable/bg_white_btn"/>
 
             <TextView
@@ -239,7 +239,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="已有账户？登录"
+                android:text="@string/to_login"
                 android:textColor="@color/yellow"/>
         </LinearLayout>
 </LinearLayout>

WeiChat/src/main/res/values-en/strings.xml

@@ -1412,4 +1412,12 @@
     <string name = "add_cost_details1"> add a consumption detail </string>
     <string name="invoice">Invoice</string>
     <string name = "please_add_image"> Please add picture</string>
+
+    <string name = "person_register"> personal registration </string>
+    <string name = "phone_number"> phone number </string>
+    <string name = "rpassword"> password </string>
+    <string name = "input_person_sign"> Please enter a personal signature </string>
+    <string name = "to_login"> existing account? Login </string>
+    <string name = "input_phone_number"> Please enter the phone number </string>
+    <string name = "input_name"> Please enter a name </string>
 </resources>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1525,4 +1525,11 @@
     <string name="next_article">下一条</string>
 
     <string name="title_approval">审批单据</string>
+    <string name="person_register">个人注册</string>
+    <string name="phone_number">手机号</string>
+    <string name="rpassword">密码</string>
+    <string name="input_person_sign">请输入个性签名</string>
+    <string name="to_login">已有账户？登录</string>
+    <string name="input_phone_number">请输入手机号</string>
+    <string name="input_name">请输入姓名</string>
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1514,4 +1514,11 @@
     <string name="add_cost_details1">添加消費明細</string>
     <string name="invoice">發票</string>
     <string name="please_add_image">請添加圖片</string>
+    <string name="person_register">個人註冊</string>
+    <string name="phone_number">手機號</string>
+    <string name="rpassword">密碼</string>
+    <string name="input_person_sign">請輸入個性簽名</string>
+    <string name="to_login">已有賬戶？登錄</string>
+    <string name="input_phone_number">請輸入手機號</string>
+    <string name="input_name">請輸入姓名</string>
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -1852,4 +1852,11 @@
     <string name="approval_opinion_error">审批意见未填写或填写不正确</string>
     <string name="enclosure">附件</string>
 
+    <string name="person_register">个人注册</string>
+    <string name="phone_number">手机号</string>
+    <string name="rpassword">密码</string>
+    <string name="input_person_sign">请输入个性签名</string>
+    <string name="to_login">已有账户？登录</string>
+    <string name="input_phone_number">请输入手机号</string>
+    <string name="input_name">请输入姓名</string>
 </resources>