Browse Source

解决冲突

SpringBoots 8 years ago
parent
commit
4be2595f36

+ 2 - 2
WeiChat/build.gradle

@@ -99,8 +99,8 @@ dependencies {
     compile project(':common')
     compile project(':network')
     compile project(':imageload')
-  //  compile project(':applogin')
-//    compile project(':message')
+    compile project(':applogin')
+
     compile project(':appcontact')
  
 }

+ 1 - 1
WeiChat/src/main/AndroidManifest.xml

@@ -147,7 +147,7 @@
         </activity>
         <!-- 登录模块 -->
         <activity
-            android:name=".ui.account.LoginActivity"
+            android:name="com.modular.login.LoginActivity"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.LoginHistoryActivity" />

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -69,7 +69,7 @@ import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.core.xmpp.dao.FriendDao;
 import com.xzjmyk.pm.activity.db.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.contact.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -25,7 +25,7 @@ import com.core.model.User;
 import com.core.dao.UserDao;
 import com.core.utils.helper.LoginHelper;
 import com.core.utils.sp.UserSp;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.ADActivity;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/UserCheckedActivity.java

@@ -12,7 +12,7 @@ import com.core.base.ActivityStack;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.utils.sp.UserSp;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
 import com.core.utils.helper.LoginHelper;
 

+ 0 - 232
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -1,232 +0,0 @@
-package com.xzjmyk.pm.activity.ui.account;
-
-import android.Manifest;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.android.volley.Response.ErrorListener;
-import com.android.volley.VolleyError;
-import com.common.LogUtil;
-import com.common.data.StringUtil;
-import com.common.hmac.Md5Util;
-import com.common.preferences.PreferenceUtils;
-import com.common.system.PermissionUtil;
-import com.common.system.SystemUtil;
-import com.common.ui.ProgressDialogUtil;
-import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
-import com.core.model.LoginRegisterResult;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
-import com.core.utils.CommonUtil;
-import com.core.utils.ToastUtil;
-import com.core.utils.helper.AvatarHelper;
-import com.core.utils.helper.LoginHelper;
-import com.xzjmyk.pm.activity.R;
-import com.core.net.http.ViewUtil;
-import com.core.utils.IntentUtils;
-
-import java.util.HashMap;
-
-import de.hdodenhof.circleimageview.CircleImageView;
-
-
-/**
- * 登陆界面
- *
- * @author Arison
- * @version 1.0
- */
-public class LoginActivity extends BaseActivity implements View.OnClickListener {
-
-    private String PASS_WORDS = "PASS_WORDS";
-    private CircleImageView mHeader;
-    private EditText mPhoneNumberEdit;
-    private EditText mPasswordEdit;
-
-    private TextView tv_register;
-    private TextView tv_findPwd;
-    private String[] permissions = {Manifest.permission.READ_PHONE_STATE};
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_login);
-        getSupportActionBar().hide();
-        initView();
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
-            AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
-        }
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (PermissionUtil.lacksPermissions(this, permissions)) {
-            PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permissions);
-        }
-        if (!MyApplication.getInstance().getBdLocationHelper().isLocationUpdate()) {
-            MyApplication.getInstance().getBdLocationHelper().requestLocation();
-        }
-        if (ViewUtil.mdProcessDialog!=null){
-            ViewUtil.mdProcessDialog.cancel();
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
-            if (grantResults.length != 1 || grantResults[0] != PackageManager.PERMISSION_GRANTED) {
-                LogUtil.i("没有获取到权限");
-            } else {
-                LogUtil.i("已经用户赋予权限获取到权限");
-            }
-        }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-    }
-
-    private void initView() {
-        mPhoneNumberEdit = (EditText) findViewById(R.id.phone_numer_edit);
-        mPasswordEdit = (EditText) findViewById(R.id.password_edit);
-        mHeader = (CircleImageView) findViewById(R.id.iv_head);
-        tv_findPwd = (TextView) findViewById(R.id.tv_findPwd);
-        tv_register = (TextView) findViewById(R.id.tv_register);
-        if (CommonUtil.getSharedPreferences(this, "user_phone") != null && CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
-            mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
-
-
-        }
-        if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
-            mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
-
-        }
-        //登陆账号
-        findViewById(R.id.login_btn).setOnClickListener(this);
-        tv_findPwd.setOnClickListener(this);
-        tv_register.setOnClickListener(this);
-        if (!StringUtil.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
-            AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.login_btn:
-                login();
-                break;
-            case R.id.tv_register:
-              startActivity(new Intent(mContext,RegisterSelectActivity.class));
-                break;
-            case R.id.tv_findPwd:
-                IntentUtils.webLinks(mContext,
-                        "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
-                        getString(R.string.login_getpwd));
-                break;
-        }
-    }
-
-    private void login() {
-        final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
-        final String password = mPasswordEdit.getText().toString().trim();
-        PreferenceUtils.putString(this, PASS_WORDS, password);
-        if (TextUtils.isEmpty(phoneNumber)) {
-            ToastMessage(getString(R.string.login_account_empty));
-            return;
-        }
-        if (TextUtils.isEmpty(password)) {
-            ToastMessage(getString(R.string.login_pwd_empty));
-            return;
-        }
-        // 加密之后的密码
-        final String digestPwd = new String(Md5Util.toMD5(password));
-        final String requestTag = "login";
-        final ProgressDialog dialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait), true);
-        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-            @Override
-            public void onCancel(DialogInterface dialog) {
-                cancelAll(requestTag);
-            }
-        });
-        dialog.setProgressDrawable(mContext.getResources().getDrawable(R.drawable.progress_color));
-        ProgressDialogUtil.show(dialog);
-
-        HashMap<String, String> params = new HashMap<String, String>();
-        params.put("telephone", Md5Util.toMD5(phoneNumber));// 账号登陆的时候需要MD5加密,服务器需求
-//		params.put("loginNo", phoneNumber);// 账号登陆的时候需要MD5加密,服务器需求
-        params.put("password", digestPwd);
-        // 附加信息
-        params.put("model", SystemUtil.getModel());
-        params.put("osVersion", SystemUtil.getOsVersion());
-        params.put("serial", SystemUtil.getDeviceId(MyApplication.getInstance()));
-        // 地址信息
-        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-        if (latitude != 0)
-            params.put("latitude", String.valueOf(latitude));
-        if (longitude != 0)
-            params.put("longitude", String.valueOf(longitude));
-        final StringJsonObjectRequest<LoginRegisterResult> request = new StringJsonObjectRequest<LoginRegisterResult>(mConfig.USER_LOGIN,
-                new ErrorListener() {
-                    @Override
-                    public void onErrorResponse(VolleyError arg0) {
-                        ProgressDialogUtil.dismiss(dialog);
-                        ToastUtil.showErrorNet(mContext);
-                    }
-                }, new StringJsonObjectRequest.Listener<LoginRegisterResult>() {
-
-            @Override
-            public void onResponse(ObjectResult<LoginRegisterResult> result) {
-                if (result == null) {
-                    ProgressDialogUtil.dismiss(dialog);
-                    ToastUtil.showErrorData(mContext);
-                    return;
-                }
-                boolean success = false;
-                if (result.getResultCode() == Result.CODE_SUCCESS) {
-                    success = LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, result);// 设置登陆用户信息
-                }
-                if (success) {
-                    login_manage(phoneNumber, password);
-                } else {
-                    String message = TextUtils.isEmpty(result.getResultMsg()) ? getString(R.string.login_failed) : result.getResultMsg();
-                    ToastUtil.showToast(mContext, message);
-                }
-                ProgressDialogUtil.dismiss(dialog);
-            }
-        }, LoginRegisterResult.class, params);
-        request.setTag(requestTag);
-        addDefaultRequest(request);
-    }
-
-
-
-    private void login_manage(String phone, String password) {
-        if (TextUtils.isEmpty(phone)) {
-            return;
-        }
-        if (TextUtils.isEmpty(password)) {
-            return;
-        }
-        if (mContext == null) {
-            mContext = this;
-            return;
-        }
-        ViewUtil.LoginTask(phone, password, mContext);
-    }
-
-}

+ 10 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginHistoryActivity.java

@@ -18,22 +18,23 @@ import com.android.volley.VolleyError;
 import com.common.hmac.Md5Util;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.core.base.ActivityStack;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
+import com.core.base.ActivityStack;
+import com.core.base.BaseActivity;
+import com.core.dao.UserDao;
 import com.core.model.LoginRegisterResult;
 import com.core.model.LoginRegisterResult.Login;
 import com.core.model.User;
-import com.core.dao.UserDao;
-import com.core.utils.sp.UserSp;
-import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
-import com.core.utils.ToastUtil;
-import com.core.utils.helper.AvatarHelper;
-import com.core.utils.helper.LoginHelper;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+import com.core.utils.sp.UserSp;
+import com.modular.login.LoginActivity;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
 
 import java.util.HashMap;
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendAudioActivity.java

@@ -27,7 +27,7 @@ import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 import com.core.utils.ToastUtil;
 import com.core.net.volley.ObjectResult;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -41,7 +41,7 @@ import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendVideoActivity.java

@@ -38,7 +38,7 @@ import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
 import com.core.utils.helper.LoginHelper;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/ADActivity.java

@@ -17,7 +17,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 
 

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/WebViewCommActivity.java

@@ -40,7 +40,7 @@ import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.message.SubMessage;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;

+ 1 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/me/FeedbackActivity.java

@@ -49,7 +49,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.Area;
 import com.xzjmyk.pm.activity.bean.UploadFileResult;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.account.LoginActivity;
+import com.modular.login.LoginActivity;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;

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

@@ -120,18 +120,17 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.login_btn:
-                login();
-                break;
-            case R.id.tv_register:
-              startActivity(new Intent(mContext,RegisterSelectActivity.class));
-                break;
-            case R.id.tv_findPwd:
-                IntentUtils.webLinks(mContext,
-                        "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F",
-                        getString(R.string.login_getpwd));
-                break;
+        int i = v.getId();
+        if (i == R.id.login_btn) {
+            login();
+
+        } else if (i == R.id.tv_register) {
+           // 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",
+                    getString(R.string.login_getpwd));
+
         }
     }
 

+ 0 - 115
app_modular/applogin/src/main/res/layout/activity_login.xml

@@ -1,115 +0,0 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#EBE9E9"
-    android:fillViewport="true">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusable="true"
-        android:focusableInTouchMode="true">
-
-        <de.hdodenhof.circleimageview.CircleImageView
-            android:id="@+id/iv_head"
-            android:layout_width="80dp"
-            android:layout_height="80dp"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="20dp"
-            android:layout_marginTop="50dp"
-            android:src="@drawable/login_header" />
-
-        <LinearLayout
-            android:id="@+id/ll_content"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/iv_head"
-            android:layout_marginBottom="10dp"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:gravity="center"
-                    android:paddingLeft="10dp"
-                    android:text="@string/login_account" />
-                <!--   android:drawableLeft="@drawable/login_user_name"-->
-                <com.core.widget.ClearEditText
-                    android:id="@+id/phone_numer_edit"
-                    style="@style/IMLineEditText"
-                    android:background="@color/white"
-                    android:hint="@string/please_input_phone_number"
-                    android:inputType="phone"
-                    android:paddingBottom="0dp"
-                    android:paddingTop="0dp" />
-            </LinearLayout>
-
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="@color/white"
-                    android:gravity="center"
-                    android:paddingLeft="10dp"
-                    android:text="@string/login_password" />
-                <!--    android:drawableLeft="@drawable/loginpw"-->
-                <com.core.widget.ClearEditText
-                    android:id="@+id/password_edit"
-                    style="@style/IMLineEditPass"
-                    android:background="@color/white"
-                    android:hint="@string/please_input_password" />
-            </LinearLayout>
-
-
-            <Button
-                android:id="@+id/login_btn"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/bg_bule_btn"
-                android:text="@string/login_button"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_main" />
-
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_findPwd"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/ll_content"
-            android:layout_marginLeft="20dp"
-            android:text="@string/login_losspwd"
-            android:textColor="@color/titleBlue" />
-
-        <TextView
-            android:id="@+id/tv_register"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_below="@+id/ll_content"
-            android:layout_marginRight="20dp"
-            android:text="@string/login_register"
-            android:textColor="@color/titleBlue" />
-    </RelativeLayout>
-</ScrollView>