IM登录不验证密码

WeiChat/build.gradle

@@ -157,6 +157,10 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
 
+    configurations {
+        all*.exclude group: 'com.android.volley'
+    }
+
     /*applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile

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

@@ -1151,7 +1151,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
     }
 
     private void LogSendToHttp(List<SignAutoLogEntity> isendEntity) {
-        String url = "http://113.105.74.140:8092/user/appAutoLog";
+        String url = com.core.app.Constants.IM_BASE_URL() + "user/appAutoLog";
         Map<String, Object> param = new HashMap<>();
         param.put("map", JSON.toJSONString(isendEntity));
         LogUtil.prinlnLongMsg("isendEntity", JSON.toJSONString(isendEntity));
@@ -1315,7 +1315,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
      */
     private void updateMessageTitle() {
         int messageTitle = R.string.msg_online;
-        if (mImStatus == AuthStateListener.AUTH_STATE_NOT) {
+       /* if (mImStatus == AuthStateListener.AUTH_STATE_NOT) {
             messageTitle = R.string.msg_offline;
             // mMessageFragment.setNetNoticeVisiable(true);
         } else if (mImStatus == AuthStateListener.AUTH_STATE_ING) {
@@ -1323,7 +1323,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         } else if (mImStatus == AuthStateListener.AUTH_STATE_SUCCESS) {
             messageTitle = R.string.msg_online;
             // mMessageFragment.setNetNoticeVisiable(false);
-        }
+        }*/
         if (mMessageFragment != null) {
             mMessageFragment.setTitle(messageTitle);
         }

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

@@ -57,6 +57,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.ADActivity;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 
+import java.io.Console;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -372,7 +373,70 @@ public class SplashActivity extends BaseActivity {
             setConfig(new ConfigBean());
             return;
         }
-        StringJsonObjectRequest<ConfigBean> request = new StringJsonObjectRequest<ConfigBean>(AppConfig.CONFIG_URL, new Response.ErrorListener() {
+        HttpRequest.getInstance().sendRequest(Constants.IM_BASE_URL,
+                new HttpParams.Builder()
+                        .url("config")
+                        .method(Method.GET)
+                        .addParam("token", 1)
+                        .build(), new HttpCallback() {
+                    @Override
+                    public void onSuccess(int flag, Object o) throws Exception {
+                        try {
+                            String result = o.toString();
+                            JSONObject resultObject = JSON.parseObject(result);
+                            ConfigBean configBean = new ConfigBean();
+                            if (JSONUtil.getInt(resultObject, "resultCode") == Result.CODE_SUCCESS) {
+                                JSONObject dataObject = resultObject.getJSONObject("data");
+                                if (dataObject != null) {
+                                    configBean.setXMPPDomain(JSONUtil.getText(dataObject, "XMPPDomain"));
+                                    configBean.setXMPPHost(JSONUtil.getText(dataObject, "XMPPHost"));
+                                    configBean.setApiUrl(JSONUtil.getText(dataObject, "apiUrl"));
+                                    configBean.setDownloadAvatarUrl(JSONUtil.getText(dataObject, "downloadAvatarUrl"));
+                                    configBean.setDownloadUrl(JSONUtil.getText(dataObject, "downloadUrl"));
+                                    configBean.setFtpHost(JSONUtil.getText(dataObject, "ftpHost"));
+                                    configBean.setFtpPassword(JSONUtil.getText(dataObject, "ftpPassword"));
+                                    configBean.setFtpUsername(JSONUtil.getText(dataObject, "ftpUsername"));
+                                    configBean.setUploadUrl(JSONUtil.getText(dataObject, "uploadUrl"));
+                                    configBean.setMeetingHost(JSONUtil.getText(dataObject, "meetingHost"));
+                                    configBean.setShareUrl(JSONUtil.getText(dataObject, "shareUrl"));
+                                    configBean.setSoftURL(JSONUtil.getText(dataObject, "softUrl"));
+                                    configBean.setHelpURL(JSONUtil.getText(dataObject, "helpUrl"));
+                                    configBean.setBuyURL(JSONUtil.getText(dataObject, "buyUrl"));
+                                    configBean.setResumeBaseUrl(JSONUtil.getText(dataObject, "resumeBaseUrl"));
+                                    configBean.setAboutURL(JSONUtil.getText(dataObject, "aboutUrl"));
+                                    JSONObject androidObject = dataObject.getJSONObject("android");
+                                    if (androidObject != null) {
+                                        ConfigBean.Android android = new ConfigBean.Android();
+                                        android.setDisableVersion(JSONUtil.getText(dataObject, "disableVersion"));
+                                        android.setVersion(JSONUtil.getText(dataObject, "version"));
+                                        android.setVersionRemark(JSONUtil.getText(dataObject, "versionRemark"));
+                                        android.setMessage(JSONUtil.getText(dataObject, "message"));
+                                        configBean.setAndroid(android);
+                                    }
+                                    JSONObject moneyObject = dataObject.getJSONObject("money");
+                                    if (moneyObject != null) {
+                                        ConfigBean.Money money = new ConfigBean.Money();
+                                        money.setIsCanChange(JSONUtil.getInt(moneyObject, "isCanChange"));
+                                        money.setLogin(JSONUtil.getInt(moneyObject, "Login"));
+                                        money.setShare(JSONUtil.getInt(moneyObject, "Share"));
+                                        money.setIntro(JSONUtil.getInt(moneyObject, "Intro"));
+                                        configBean.setMoney(money);
+                                    }
+                                }
+                            }
+                            setConfig(configBean);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onFail(int flag, String failStr) throws Exception {
+                        setConfig(new ConfigBean());// 读取网络配置失败，使用默认配置
+                    }
+                });
+
+       /* StringJsonObjectRequest<ConfigBean> request = new StringJsonObjectRequest<ConfigBean>(AppConfig.CONFIG_URL, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
                 setConfig(new ConfigBean());// 读取网络配置失败，使用默认配置
@@ -389,7 +453,7 @@ public class SplashActivity extends BaseActivity {
                 setConfig(configBean);
             }
         }, ConfigBean.class, null);
-        addShortRequest(request);
+        addShortRequest(request);*/
     }
 
     /**

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -310,14 +310,14 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
         meTitleTv.setText(R.string.me);
         //编辑
         findViewById(R.id.editInfoIv).setOnClickListener(this);
-        findViewById(R.id.editInfoIv).setOnLongClickListener(new View.OnLongClickListener() {
+        /*findViewById(R.id.editInfoIv).setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View view) {
                 startActivity(new Intent(ct, CustomerVisitActivity.class)
                         .putExtra("caller", "ProjectBusinessChance"));
                 return false;
             }
-        });
+        });*/
         findViewById(R.id.my_data_rl).setOnClickListener(this);
         View workCardRl = findViewById(R.id.workCardRl);
         workCardRl.setVisibility(View.VISIBLE);
@@ -528,15 +528,15 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                         , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
             case R.id.editInfoIv://个人资料
-                if (BaseConfig.isDebug()) {
-                    startActivity(new Intent(ct, CustomerManageActivity.class)
-                            .putExtra(Constants.Intents.CALLER, "Sale")
-                            .putExtra(Constants.Intents.TITLE, "Sale")
-                            .putExtra(Constants.Intents.ID, 0)
-                    );
-                } else {
-                    ct.startActivity(new Intent(getActivity(), BaseInfoActivity.class));
-                }
+//                if (BaseConfig.isDebug()) {
+//                    startActivity(new Intent(ct, CustomerManageActivity.class)
+//                            .putExtra(Constants.Intents.CALLER, "Sale")
+//                            .putExtra(Constants.Intents.TITLE, "Sale")
+//                            .putExtra(Constants.Intents.ID, 0)
+//                    );
+//                } else {
+                ct.startActivity(new Intent(getActivity(), BaseInfoActivity.class));
+//                }
                 break;
             case R.id.rl_master_change:
                 if (!platform) {
@@ -557,7 +557,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
                 tv_menu_setting.setVisibility(View.GONE);
                 tv_oa_desc.setVisibility(View.GONE);
                 iv_desc_oa.setVisibility(View.GONE);
-                
+
 //                ct.startActivity(new Intent(getActivity(), CommonWebviewActivity.class)
 //                        .putExtra("scan_url","http://10.1.80.118:3000/android")
 //                .putExtra("title",""));

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

@@ -299,7 +299,7 @@ public class ChatActivity extends SupportToolBarActivity
                 onDeleteMore();
             }
         });
-        
+
         //resetSendMsgRl(mChatContentView);
     }
 
@@ -1038,9 +1038,7 @@ public class ChatActivity extends SupportToolBarActivity
      * @author：Administrator on 2016/3/14 19:37
      */
     public void sendPushTask(String from, String to, String body) {
-        //http://113.105.74.140:8092/tigase/notify?from=100118&to=100254&body=rrrrr&ts=1
-        //http://192.168.253.244:8092/tigase/notify
-        String url = "http://113.105.74.140:8092/tigase/notify";
+        String url = com.core.app.Constants.IM_BASE_URL()+"tigase/notify";
         Map<String, Object> params = new HashMap<String, Object>();
 //        int[] str;
 //        params.put("text", str);

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

@@ -317,8 +317,8 @@ public class MucChatActivity extends SupportToolBarActivity
 
         /*
          * String roomName = MyApplication.getInstance().roomName;
-		 * updateUi(roomName);
-		 */
+         * updateUi(roomName);
+         */
     }
 
     @Override
@@ -438,8 +438,8 @@ public class MucChatActivity extends SupportToolBarActivity
                     }
                     /*
                      * else if(messageType==XmppMessage.TYPE_CARD){
-					 * sendCard(instantMessage.getObjectId()); }
-					 */
+                     * sendCard(instantMessage.getObjectId()); }
+                     */
                     instantMessage = null;
                 }
             }, 1000);
@@ -557,7 +557,7 @@ public class MucChatActivity extends SupportToolBarActivity
 
     //把信息转发百度推送
     public void sendPushTask(String from, String to, String body, int[] str) {
-        String url = "http://113.105.74.140:8092/tigase/push";
+        String url = com.core.app.Constants.IM_BASE_URL() + "tigase/push";
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("text", JSON.toJSONString(str));
         params.put("body", body);

WeiChat/version.properties

@@ -1,5 +1,5 @@
 #Fri May 22 09:52:19 CST 2020
 debugName=972
-versionName=718
 debugCode=972
-versionCode=272
+versionName=721
+versionCode=275

app_core/common/src/main/java/com/core/app/AppConfig.java

@@ -32,7 +32,7 @@ public class AppConfig {
     public static final String sPackageName = "com.xzjmyk.pm.activity";
 
     /* 请求配置的接口 */
-    public static final String CONFIG_URL = "http://113.105.74.140:8092/config";
+    public static final String CONFIG_URL = com.core.app.Constants.IM_BASE_URL() + "config";
     //public static final String CONFIG_ URL = "http://192.168.253.155:8092/config";
     /* 分页的Size */
     public static final int PAGE_SIZE = 500;

app_core/common/src/main/java/com/core/app/Constants.java

@@ -14,7 +14,8 @@ public class Constants {
     public static final String ACCOUNT_CENTER_HOST = "https://sso.ubtob.com/";
     //    public static final String ACCOUNT_CENTER_HOST = "https://account.ubtob.com/";
     //IM正式地址
-    public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
+//    public static final String IM_BASE_URL = "http://113.105.74.140:8092/";
+    public static final String IM_BASE_URL = "https://im.ubtob.net/";
     //IM测试地址
     public static final String IM_BASE_URL_TEST = "http://113.105.74.135:8092/";
     //询价服务正式地址
@@ -458,7 +459,7 @@ public class Constants {
     public static final int MSG_FROM_SERVER = 1;
     public static final String BASEURL = "http://news-at.zhihu.com/api/4/";
     public static final String START = "start-image/1080*1776";
-    public static String BASE_STEP_URL = "http://113.105.74.140:8092/user/";
+    public static String BASE_STEP_URL = IM_BASE_URL + "user/";
 
     //工作菜单缓存
     public static String WORK_MENU_CACHE = "work_menu_cache";

app_core/common/src/main/java/com/core/utils/helper/LoginHelper.java

@@ -186,6 +186,9 @@ public class LoginHelper {
      * @author：Administrator on 2016/1/27 15:13
      */
     public static boolean setLoginUser(Context context, String telephone, String password, ObjectResult<LoginRegisterResult> result) {
+        User user = MyApplication.getInstance().mLoginUser;
+        user.setTelephone(telephone);
+        user.setPassword(password);
         if (result == null) {
             return false;
         }
@@ -196,9 +199,6 @@ public class LoginHelper {
             return false;
         }
         // 保存当前登陆的用户信息和Token信息作为全局变量，方便调用
-        User user = MyApplication.getInstance().mLoginUser;
-        user.setTelephone(telephone);
-        user.setPassword(password);
         user.setUserId(result.getData().getUserId());
         user.setNickName(result.getData().getNickName());
         // user.setCompanyId(result.getData().getCompanyId());

app_core/common/src/main/res/layout/fragment_me.xml

@@ -1,8 +1,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/white"
-            android:scrollbars="none">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:scrollbars="none">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -211,9 +211,10 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:background="@drawable/selector_item_white_pass"
-            android:paddingBottom="@dimen/padding"
             android:paddingLeft="@dimen/padding"
-            android:paddingTop="@dimen/padding">
+            android:paddingTop="@dimen/padding"
+            android:paddingBottom="@dimen/padding"
+            android:visibility="gone">
 
             <TextView
                 android:id="@+id/tv_zone"
@@ -246,11 +247,11 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:layout_marginLeft="10dp"
-            android:background="@color/item_line" />
+<!--        <View-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="@dimen/line"-->
+<!--            android:layout_marginLeft="10dp"-->
+<!--            android:background="@color/item_line" />-->
 
         <!--公司-->
         <!--账套-->
@@ -284,11 +285,11 @@
             <TextView
                 android:id="@+id/company_tv"
                 style="@style/IMTbleLine_TextValue"
-                android:textStyle="bold"
                 android:layout_toLeftOf="@+id/company_arrow_img"
                 android:layout_toRightOf="@+id/company_text"
                 android:textColor="#999999"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:textStyle="bold" />
 
             <ImageView
                 android:id="@+id/company_arrow_img"
@@ -330,11 +331,11 @@
             <TextView
                 android:id="@+id/master_tv"
                 style="@style/IMTbleLine_TextValue"
-                android:textStyle="bold"
                 android:layout_toLeftOf="@+id/master_arrow_img"
                 android:layout_toRightOf="@+id/master_text"
                 android:textColor="#999999"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:textStyle="bold" />
 
             <ImageView
                 android:id="@+id/master_arrow_img"
@@ -470,14 +471,15 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/workCardRl"
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:background="@drawable/selector_item_white_pass"
             android:paddingLeft="@dimen/padding"
-            android:visibility="visible"
-            android:paddingTop="@dimen/padding">
+            android:paddingTop="@dimen/padding"
+            android:visibility="visible">
 
             <View
                 android:layout_width="match_parent"
@@ -491,12 +493,13 @@
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerInParent="true"
-                android:layout_marginRight="23dp"
                 android:layout_marginTop="12dp"
-                android:visibility="gone"
+                android:layout_marginRight="23dp"
                 android:background="@drawable/hongdian"
                 android:textColor="@android:color/white"
-                android:textSize="10.0dip" />
+                android:textSize="10.0dip"
+                android:visibility="gone" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -519,6 +522,7 @@
 
 
         </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/setting_rl"
             android:layout_width="match_parent"
@@ -539,8 +543,8 @@
                 android:layout_height="10dp"
                 android:layout_alignParentRight="true"
                 android:layout_centerInParent="true"
-                android:layout_marginRight="23dp"
                 android:layout_marginTop="12dp"
+                android:layout_marginRight="23dp"
                 android:layout_toLeftOf="@+id/iv_arrow"
                 android:background="@drawable/hongdian"
                 android:textColor="@android:color/white"

app_modular/applogin/src/main/java/com/modular/login/activity/LoginActivity.java

@@ -214,7 +214,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                     @Override
                     public void onErrorResponse(VolleyError arg0) {
                         ProgressDialogUtil.dismiss(dialog);
-                        ToastUtil.showToast(mContext, R.string.net_exception, mToastLayout);
+//                        ToastUtil.showToast(mContext, R.string.net_exception, mToastLayout);
+                        LoginHelper.setLoginUser(mContext, phoneNumber, digestPwd, null);// 设置登陆用户信息
+                        login_manage(phoneNumber, password);
                     }
                 }, new StringJsonObjectRequest.Listener<LoginRegisterResult>() {
 

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 17,
             targetSdkVersion : 28,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 240,
-            versionName      : '6.9.7',
+            versionCode      : 241,
+            versionName      : '7.0.0',
     ]
 
     depsVersion = [