SpringBoots 8 лет назад
Родитель
Сommit
9ef8f01d15

+ 11 - 16
WeiChat/src/main/AndroidManifest.xml

@@ -145,21 +145,17 @@
                 <action android:name="cat.ereza.customactivityoncrash.ERROR" />
             </intent-filter>
         </activity>
-        <!-- 登录模块 -->
-        <activity
-            android:name="com.modular.login.LoginActivity"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustPan" />
+    
         <activity android:name=".ui.account.LoginHistoryActivity" />
         <!---->
-        <activity android:name=".ui.account.DataDownloadActivity" >
+        <activity android:name=".ui.account.DataDownloadActivity">
             <intent-filter>
                 <action android:name="com.modular.main.DataDownloadActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        
-        
+
+
         <activity android:name=".ui.account.RegisterActivity" />
         <activity android:name=".ui.account.RegisterPasswordActivity" />
         <activity android:name=".ui.account.RegisterUserBasicInfoActivity" />
@@ -209,13 +205,13 @@
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity
             android:name=".ui.erp.activity.WebViewCommActivity"
-            android:hardwareAccelerated="false" >
+            android:hardwareAccelerated="false">
             <intent-filter>
                 <action android:name="com.modular.main.WebViewCommActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-    
+
         <activity
             android:name=".ui.erp.activity.DetailTaskActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
@@ -249,7 +245,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" >
+            android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.main.MainActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -994,15 +990,14 @@
         <activity android:name=".ui.erp.activity.oa.FileLoadingActivity" />
         <activity android:name=".ui.erp.activity.oa.ApprovalActivity" />
         <activity android:name=".ui.erp.activity.AppWebViewActivity" />
-        <activity
-            android:name=".ui.erp.activity.message.PersonalRegActivity"
-            android:label="个人注册" />
+
         <activity
             android:name=".ui.erp.activity.contanct.ContactsActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.account.RegisterSelectActivity"></activity>
+      
+
         <activity android:name=".ui.me.TemperatureActivity"></activity>
-        <!--<activity android:name=".ui.me.ToastDemoActivity"></activity>-->
+
     </application>
 
 </manifest>

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginHistoryActivity.java

@@ -44,6 +44,7 @@ import java.util.HashMap;
  * @author Dean Tao
  * @version 1.0
  */
+@Deprecated
 public class LoginHistoryActivity extends BaseActivity implements View.OnClickListener {
 
 	private ImageView mAvatarImgView;

+ 1 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterActivity.java

@@ -35,6 +35,7 @@ import java.util.Map;
  * @author Dean Tao
  * @version 1.0
  */
+@Deprecated
 public class RegisterActivity extends BaseActivity {
     public static final String EXTRA_AUTH_CODE = "auth_code";
     public static final String EXTRA_PHONE_NUMBER = "phone_number";

+ 4 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/RegisterSelectActivity.java

@@ -14,10 +14,10 @@ import com.core.utils.IntentUtils;
 
 public class RegisterSelectActivity extends BaseActivity {
     @ViewInject(R.id.person_btn)
-   Button person_btn;
+    Button person_btn;
     @ViewInject(R.id.company_btn)
-   Button         company_btn;
-    
+    Button company_btn;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -31,7 +31,7 @@ public class RegisterSelectActivity extends BaseActivity {
                 finish();
             }
         });
-        
+
         company_btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

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

@@ -35,11 +35,11 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
+ * 个人用户注册
  * Created by FANGlh on 2017/7/21.
  * function:
  */
-
-public class PersonalRegActivity extends BaseActivity implements View.OnClickListener{
+public class PersonalRegActivity extends BaseActivity implements View.OnClickListener {
     @ViewInject(R.id.phone_et)
     private FormEditText phone_et;
     @ViewInject(R.id.password_et)
@@ -59,18 +59,18 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
     private int male_log = 1;
     private long bir_Timestamp = 1489141231;
     private String md5_password;
-    private Handler rHandler = new Handler(){
+    private Handler rHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             String result = msg.getData().getString("result");
-            switch (msg.what){
+            switch (msg.what) {
                 case 0x01:
-                    if (!StringUtil.isEmpty(result)){
-                        if (result.contains("resultCode") && JSON.parseObject(result).getInteger("resultCode") == 1){
-                            Toast.makeText(ct,"注册成功",Toast.LENGTH_LONG).show();
+                    if (!StringUtil.isEmpty(result)) {
+                        if (result.contains("resultCode") && JSON.parseObject(result).getInteger("resultCode") == 1) {
+                            Toast.makeText(ct, "注册成功", Toast.LENGTH_LONG).show();
                             finish();
-                        }else{
+                        } else {
                             ToastMessage(JSON.parseObject(result).getString("resultMsg"));
                         }
                     }
@@ -112,7 +112,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     @Override
     public void onClick(View v) {
-        switch(v.getId()){
+        switch (v.getId()) {
             case R.id.male_et:
                 showSelectSexDialog();
                 break;
@@ -144,10 +144,10 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
             ToastMessage(getString(R.string.input_name));
             return;
         }*/
-        if (phone_et.testValidity() && password_et.testValidity() && name_et.testValidity()){
-            if(!CommonUtil.isNetWorkConnected(this)){
+        if (phone_et.testValidity() && password_et.testValidity() && name_et.testValidity()) {
+            if (!CommonUtil.isNetWorkConnected(this)) {
                 ToastMessage(getString(R.string.common_notlinknet));
-            }else {
+            } else {
                 md5_password = Md5Util.toMD5(password_et.getText().toString());
                 doRegiter();
             }
@@ -159,15 +159,15 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
         progressDialog.dismiss();
         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",md5_password);
-        params.put("userType",0);
-        params.put("companyId",0);
-        params.put("nickname",name_et.getText().toString());
-        params.put("description","");
-        params.put("sex",male_log);
-        params.put("birthday",bir_Timestamp);
-        LogUtil.prinlnLongMsg("0x01params","url="+url+JSON.toJSONString(params));
+        params.put("telephone", phone_et.getText().toString());
+        params.put("password", md5_password);
+        params.put("userType", 0);
+        params.put("companyId", 0);
+        params.put("nickname", name_et.getText().toString());
+        params.put("description", "");
+        params.put("sex", male_log);
+        params.put("birthday", bir_Timestamp);
+        LogUtil.prinlnLongMsg("0x01params", "url=" + url + JSON.toJSONString(params));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
         ViewUtil.httpSendRequest(ct, url, params, rHandler, headers, 0x01, null, null, "post");
@@ -198,7 +198,7 @@ public class PersonalRegActivity extends BaseActivity implements View.OnClickLis
 
     private void showSelectSexDialog() {
         // 1是男,0是女,2是全部
-        String[] sexs = new String[]{ getString(R.string.user_body), getString(R.string.user_girl)};
+        String[] sexs = new String[]{getString(R.string.user_body), getString(R.string.user_girl)};
         int checkItem = 0;
         new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
                 .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {

+ 1 - 1
WeiChat/src/main/res/layout/personal_reg_activity.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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"

+ 2 - 2
WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,3 +1,3 @@
 #发布版本状态改为true,测试版本状态为false
-#release_version=false
-release_version=true
+release_version=false
+#release_version=true

+ 17 - 1
app_modular/applogin/src/main/AndroidManifest.xml

@@ -1,2 +1,18 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modular.login" />
+    package="com.modular.login"
+    android:versionCode="111"
+    android:versionName="5.8.9">
+    <application>
+        <!-- 登录模块 -->
+        <activity
+            android:name=".LoginActivity"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustPan" />
+        <!--注册选择-->
+        <activity android:name=".RegisterSelectActivity"></activity>
+        <!--个人注册-->
+        <activity
+            android:name=".PersonalRegActivity"
+            android:label="个人注册"></activity>
+    </application>
+</manifest>

+ 1 - 1
app_modular/applogin/src/main/java/com/modular/login/LoginActivity.java

@@ -125,7 +125,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
             login();
 
         } else if (i == R.id.tv_register) {
-           // startActivity(new Intent(mContext, RegisterSelectActivity.class));
+            startActivity(new Intent(mContext, RegisterSelectActivity.class));
         } else if (i == R.id.tv_findPwd) {
             IntentUtils.webLinks(mContext,
                     "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",

+ 180 - 0
app_modular/applogin/src/main/java/com/modular/login/PersonalRegActivity.java

@@ -0,0 +1,180 @@
+package com.modular.login;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.alibaba.fastjson.JSON;
+import com.andreabaccega.widget.FormEditText;
+import com.common.LogUtil;
+import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
+import com.common.hmac.Md5Util;
+import com.core.app.Constants;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.net.utils.NetUtils;
+import com.core.utils.CommonUtil;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 个人用户注册
+ */
+public class PersonalRegActivity extends BaseActivity implements View.OnClickListener {
+
+    private FormEditText phone_et;
+    private FormEditText password_et;
+    private FormEditText name_et;
+    private Button register_btn;
+    private TextView to_login_tv;
+    
+    private int male_log = 1;
+    private long bir_Timestamp = 1489141231;
+    private String md5_password;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.personal_reg_activity);
+        getSupportActionBar().hide();
+        phone_et=(FormEditText) findViewById(R.id.phone_et);
+        password_et=(FormEditText) findViewById(R.id.password_et);
+        name_et=(FormEditText) findViewById(R.id.name_et);
+        register_btn= (Button) findViewById(R.id.register_btn);
+        to_login_tv= (TextView) findViewById(R.id.to_login_tv);
+        initView();
+    }
+
+    private void initView() {
+        register_btn.setOnClickListener(this);
+        to_login_tv.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int i = v.getId();
+        if (i == R.id.male_et) {
+            //showSelectSexDialog();
+
+        } else if (i == R.id.birthday_et) {
+           // showSelectBirthdayDialog();
+
+        } else if (i == R.id.register_btn) {
+            registerJudge();
+
+        } else if (i == R.id.to_login_tv) {
+            finish();
+
+        }
+
+    }
+
+    private void registerJudge() {
+        if (phone_et.testValidity() && password_et.testValidity() && name_et.testValidity()) {
+            if (!NetUtils.isNetWorkConnected(this)) {
+                ToastMessage(getString(R.string.common_notlinknet));
+            } else {
+                md5_password = Md5Util.toMD5(password_et.getText().toString());
+                doRegiter();
+            }
+        }
+
+    }
+
+    private void doRegiter() {
+        progressDialog.dismiss();
+        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", md5_password);
+        params.put("userType", 0);
+        params.put("companyId", 0);
+        params.put("nickname", name_et.getText().toString());
+        params.put("description", "");
+        params.put("sex", male_log);
+        params.put("birthday", bir_Timestamp);
+        LogUtil.prinlnLongMsg("0x01params", "url=" + url + JSON.toJSONString(params));
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, rHandler, headers, 0x01, null, null, "post");
+    }
+
+//    private void showSelectBirthdayDialog() {
+//        DateTimePicker picker = new DateTimePicker(this, DateTimePicker.YEAR_MONTH_DAY);
+//        picker.setRange(1960, CalendarUtil.getYear());
+//        picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
+//            @Override
+//            public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
+//                Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
+//                GregorianCalendar calendar = new GregorianCalendar(Integer.parseInt(year), Integer.parseInt(month) - 1, Integer.parseInt(day));
+//
+//                long currentTime = System.currentTimeMillis() / 1000;
+//                long birthdayTime = calendar.getTime().getTime() / 1000;
+//                if (birthdayTime > currentTime) {
+//                    ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
+//                } else {
+//                    birthday_et.setText(year + "-" + month + "-" + day);
+//                    bir_Timestamp = birthdayTime;
+//                }
+//            }
+//        });
+//        picker.show();
+//
+//    }
+
+    // // 1是男,0是女,2是全部
+//    private void showSelectSexDialog() {
+//        String[] sexs = new String[]{getString(R.string.user_body), getString(R.string.user_girl)};
+//        int checkItem = 0;
+//        new AlertDialog.Builder(this).setTitle(getString(R.string.select_sex_title))
+//                .setSingleChoiceItems(sexs, checkItem, new DialogInterface.OnClickListener() {
+//                    @Override
+//                    public void onClick(DialogInterface dialog, int which) {
+//                        if (which == 0) {
+//                            male_et.setText(R.string.user_body);
+//                            male_log = 1;
+//                        } else {
+//                            male_et.setText(R.string.user_girl);
+//                            male_log = 0;
+//                        }
+//                        dialog.dismiss();
+//                    }
+//                }).setCancelable(true).create().show();
+//    }
+
+    private Handler rHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            String result = msg.getData().getString("result");
+            switch (msg.what) {
+                case 0x01:
+                    if (!StringUtil.isEmpty(result)) {
+                        if (result.contains("resultCode") && JSON.parseObject(result).getInteger("resultCode") == 1) {
+                            Toast.makeText(ct, "注册成功", Toast.LENGTH_LONG).show();
+                            finish();
+                        } else {
+                            ToastMessage(JSON.parseObject(result).getString("resultMsg"));
+                        }
+                    }
+                    break;
+                case Constants.APP_SOCKETIMEOUTEXCEPTION:
+                    if (JSONUtil.validate(result)) {
+                        ToastMessage(JSON.parseObject(result).getString("exceptionInfo"));
+                    } else {
+                        ToastMessage(result);
+                    }
+                    progressDialog.dismiss();
+                    register_btn.setEnabled(true);
+                    break;
+            }
+        }
+    };
+}

+ 43 - 0
app_modular/applogin/src/main/java/com/modular/login/RegisterSelectActivity.java

@@ -0,0 +1,43 @@
+package com.modular.login;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.core.base.BaseActivity;
+import com.core.utils.IntentUtils;
+
+import de.hdodenhof.circleimageview.CircleImageView;
+
+public class RegisterSelectActivity extends BaseActivity implements View.OnClickListener {
+    private CircleImageView ivHead;
+    
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_register_select);
+        ivHead = (CircleImageView) findViewById(R.id.iv_head);
+        getSupportActionBar().setTitle("新用户注册");
+        findViewById(R.id.person_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(mContext, PersonalRegActivity.class));
+                finish();
+            }
+        });
+
+        findViewById(R.id.company_btn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                IntentUtils.webLinks(mContext,
+                        "https://account.ubtob.com/sso/register",
+                        "企业注册");
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View v) {
+        
+    }
+}