Browse Source

正式版本5.7.1

SpringBoots 9 years ago
parent
commit
381dadca34

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

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="83"
+    android:versionCode="84"
     android:versionName="5.7.0">
 
     <uses-sdk

+ 5 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -207,6 +207,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     }
 
    public void onRegister(View view){
-        ViewUtil.webLinks(mContext,"https://account.ubtob.com/sso/register","新用户注册");
+        ViewUtil.webLinks(mContext, "https://account.ubtob.com/sso/register", "新用户注册");
+    }
+    
+    public void onFindPWD(View view){
+        ViewUtil.webLinks(mContext, "https://account.ubtob.com/user/pwd?appId=home&returnURL=http%3A%2F%2Fwww.ubtob.com%2F", "密码找回");
     }
 }

+ 0 - 1
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -56,7 +56,6 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;

+ 2 - 1
WeiChat/src/main/res/layout/activity_login.xml

@@ -65,9 +65,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dp"
+            android:onClick="onFindPWD"
             android:textColor="@color/titleBlue"
             android:text="忘记密码"/>
-
+        
         <TextView
             android:layout_below="@+id/ll_content"
             android:layout_width="wrap_content"