Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/AndroidManifest.xml

@@ -105,6 +105,8 @@
         <activity android:name=".ui.erp.activity.ErpMenActivity" />
         <activity android:name=".ui.erp.activity.DbfindListActivity" />
         <activity android:name=".ui.erp.activity.AddTaskActivity" />
+        <activity android:name=".ui.erp.activity.WebViewCommActivity" />
+
         <activity
             android:name=".ui.erp.activity.DetailTaskActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" >

WeiChat/src/main/java/com/sk/weichat/ui/account/LoginActivity.java

@@ -103,6 +103,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 	}
 
 	private void login() {
+		MyApplication.cookie=null;
 		final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();
 		final String password = mPasswordEdit.getText().toString().trim();
 		if (TextUtils.isEmpty(phoneNumber)) {

WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/WorksFragment.java

@@ -32,6 +32,7 @@ import com.sk.weichat.ui.circle.BusinessCircleActivity;
 import com.sk.weichat.ui.erp.activity.CommonFragmentActivity;
 import com.sk.weichat.ui.erp.activity.CompanyContactsActivity;
 import com.sk.weichat.ui.erp.activity.ErpMenActivity;
+import com.sk.weichat.ui.erp.net.ViewUtil;
 import com.sk.weichat.util.PreferenceUtils;
 import com.sk.weichat.util.ToastUtil;
 import com.sk.weichat.volley.ArrayResult;
@@ -54,6 +55,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     private LayoutInflater mInflater;
     @ViewInject(R.id.iv_remain)
     private ImageView iv_remain;
+    @ViewInject(R.id.setting_rl)
+    private RelativeLayout setting_rl;
     @ViewInject(R.id.rl_uas_sys)
     private RelativeLayout rl_uas_sys;
     @ViewInject(R.id.my_friend_rl)
@@ -80,6 +83,7 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
 
     private void initView() {
         rl_uas_sys.setOnClickListener(this);
+        setting_rl.setOnClickListener(this);
         my_friend_rl.setOnClickListener(this);
         if (MainActivity.isUnReadWork)
             iv_remain.setVisibility(View.VISIBLE);
@@ -91,6 +95,9 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
+            case R.id.setting_rl:
+                ViewUtil.WebLinks(ct,"http://www.ubtob.com/#","优软商务");
+                break;
             case R.id.rl_uas_sys:
                 ct.startActivity(new Intent(ct, ErpMenActivity.class));
                 break;

WeiChat/src/main/java/com/sk/weichat/ui/erp/net/ViewUtil.java

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSON;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.ui.MainActivity;
 import com.sk.weichat.ui.account.DataDownloadActivity;
+import com.sk.weichat.ui.erp.activity.WebViewCommActivity;
 import com.sk.weichat.ui.erp.model.LoginEntity;
 import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.ui.erp.util.Constants;
@@ -773,4 +774,17 @@ public class ViewUtil {
         params.put("master", master);
         httpSendRequest(ct, url, params, handler, null, Constants.SUCCESS_ERP, null, null, "post");
     }
+
+
+    /**
+     * @注释：跳转嵌入网页页面
+     * @param: url 经过登录验证之后的URL路径跳转
+     *         text 客户端嵌入网页页面动态显示文字
+     */
+    public static void  WebLinks(Context ct,String  url,String text){
+        Intent intent_web =new Intent(ct, WebViewCommActivity.class);
+        intent_web.putExtra("url", url);
+        intent_web.putExtra("p", text);
+        ct.startActivity(intent_web);
+    }
 }