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

WeiChat/src/main/AndroidManifest.xml

@@ -938,7 +938,7 @@
         <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"></activity>
 
         <activity android:name=".ui.me.InfoCodeActivity"
-            android:label="二维码名片"></activity>
+            android:label="@string/info_2dcode"></activity>
     </application>
 
 </manifest>

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

@@ -6,7 +6,14 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.google.zxing.BarcodeFormat;
@@ -20,6 +27,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.util.DisplayUtil;
 
 import java.io.UnsupportedEncodingException;
 
@@ -28,7 +36,7 @@ import java.io.UnsupportedEncodingException;
  * function:
  */
 
-public class InfoCodeActivity extends BaseActivity {
+public class InfoCodeActivity extends BaseActivity implements View.OnClickListener{
     @ViewInject(R.id.code_main)
     private ImageView code_main;
     @ViewInject(R.id.common_docui_photo_img)
@@ -37,7 +45,7 @@ public class InfoCodeActivity extends BaseActivity {
     private TextView name_tv;
     @ViewInject(R.id.common_docui_Section_tv)
     private TextView section_tv;
-    // 图片宽度的一般
+    // 图片宽度的一半
     private static final int IMAGE_HALFWIDTH = 20;
     // 显示二维码图片
     private ImageView imageview;
@@ -48,7 +56,7 @@ public class InfoCodeActivity extends BaseActivity {
     private String uu_phone;
     private String uu_name;
     private String loginUserId;
-
+    private PopupWindow setWindow = null;//
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -112,6 +120,78 @@ public class InfoCodeActivity extends BaseActivity {
         },1000);
     }
 
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_infocode, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.title:
+                showPopupWindow();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    private void showPopupWindow() {
+        if (setWindow == null) initPopupWindow();
+        setWindow.showAtLocation(getWindow().getDecorView().
+                findViewById(android.R.id.content), Gravity.BOTTOM, 0, 0);
+        DisplayUtil.backgroundAlpha(this, 0.4f);
+    }
+
+    private void closePopupWindow() {
+        if (setWindow != null)
+            setWindow.dismiss();
+        DisplayUtil.backgroundAlpha(this, 1f);
+    }
+
+    private void initPopupWindow() {
+        View viewContext = LayoutInflater.from(ct).inflate(R.layout.infocode_menu_more, null);
+        viewContext.findViewById(R.id.share_2code).setOnClickListener(this);
+        viewContext.findViewById(R.id.change_style).setOnClickListener(this);
+        viewContext.findViewById(R.id.save_to_MBphone).setOnClickListener(this);
+        viewContext.findViewById(R.id.scan_2dcode).setOnClickListener(this);
+        viewContext.findViewById(R.id.cancel_tv).setOnClickListener(this);
+
+        setWindow = new PopupWindow(viewContext,
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        setWindow.setAnimationStyle(R.style.MenuAnimationFade);
+        setWindow.setBackgroundDrawable(mContext.getResources().getDrawable(R.drawable.bg_popuwin));
+        setWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                closePopupWindow();
+            }
+        });
+    }
+
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()){
+            case R.id.share_2code:
+                closePopupWindow();
+                break;
+            case R.id.change_style:
+                closePopupWindow();
+                break;
+            case R.id.save_to_MBphone:
+                closePopupWindow();
+                break;
+            case R.id.scan_2dcode:
+                closePopupWindow();
+                break;
+            case R.id.cancel_tv:
+                closePopupWindow();
+                break;
+        }
+    }
+
     /**
      * 生成二维码
      * @throws WriterException
@@ -147,4 +227,5 @@ public class InfoCodeActivity extends BaseActivity {
 
         return bitmap;
     }
+
 }

WeiChat/src/main/res/layout/info_code_main.xml

@@ -65,7 +65,7 @@
         android:layout_marginTop="10dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="扫一扫上面的二维码图案，加我好友"
+        android:text="@string/scan_2dcode_addme"
         android:layout_below="@+id/code_main"
         android:gravity="center_horizontal"/>
 </RelativeLayout>

WeiChat/src/main/res/layout/infocode_menu_more.xml

@@ -0,0 +1,78 @@
+<?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="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/share_2code"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/share_2code"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/change_style"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/change_style"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/save_to_MBphone"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/save_to_MBphone"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/button_invalid" />
+
+    <TextView
+        android:id="@+id/scan_2dcode"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/scan_2dcode"
+        android:textColor="@color/text_main"
+        android:textSize="15sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:background="@color/black_gray" />
+
+    <TextView
+        android:id="@+id/cancel_tv"
+        android:layout_width="match_parent"
+        android:layout_height="45dp"
+        android:background="@drawable/text_click_bg"
+        android:gravity="center"
+        android:text="@string/common_cancel"
+        android:textColor="@color/red"
+        android:textSize="15sp" />
+
+</LinearLayout>

WeiChat/src/main/res/menu/menu_infocode.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@id/title"
+        android:icon="@drawable/ic_dot_more"
+        android:title="@string/oamore_tltle"
+        app:showAsAction="always" />
+</menu>

WeiChat/src/main/res/menu/menu_outoffice.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@id/title"
-        android:title="设置"
+        android:title="@string/user_setting"
         android:icon="@drawable/setting"
         app:showAsAction="always" />
 </menu>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1460,4 +1460,10 @@
     <string name="crm_icon3">我的下属</string>
     <string name="crm_icon4">我的指标</string>
     <string name="crm_icon5">遗忘的客户</string>
+    <string name="info_2dcode">二维码名片</string>
+    <string name="scan_2dcode_addme">扫一扫上面的二维码图案，加我好友</string>
+    <string name="share_2code">分享二维码</string>
+    <string name="change_style">换个样式</string>
+    <string name="save_to_MBphone">保存到手机</string>
+    <string name="scan_2dcode">扫描二维码</string>
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1409,6 +1409,7 @@
     <string name="Set_Scheduling">排班</string>
     <string name="Scheduling_type">排班類型</string>
     <string name="Normal_frequency">正常班次</string>
+
    <string name="no_flights">無班次，聯繫管理員</string>
    <string name="Monday">週一</string>
    <string name="Tuesday">週二</string>
@@ -1444,11 +1445,17 @@
     <string name="add_blacklist_prompt">確定要加入黑名單嗎？ </string>
     <string name="add_blacklist_succ">加入黑名單成功</string>
     <string name="unsubmit">反提交</string>
-    <string name="Operation_succeeded">Operation succeeded</string>
+    <string name="Operation_succeeded">操作成功</string>
 
     <string name="crm_icon1">我的排名</string>
     <string name="crm_icon2">本月銷售簡報</string>
     <string name="crm_icon3">我的下屬</string>
     <string name="crm_icon4">我的名額</string>
     <string name="crm_icon5">遺忘的客戶</string>
+    <string name="info_2dcode">二維碼名片</string>
+    <string name="scan_2dcode_addme">掃一掃上面的二維碼圖案，加我好友</string>
+    <string name="share_2code">分享二維碼</string>
+    <string name="change_style">換個樣式</string>
+    <string name="save_to_MBphone">保存到手機</string>
+    <string name="scan_2dcode">掃描二維碼</string>
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -1677,6 +1677,13 @@
     <string name="outdays">出差</string>
     <string name="signcard">补卡</string>
     <string name="sure_delete_content">你确定删除该联系人吗</string>
+    <string name="info_2dcode">二维码名片</string>
+    <string name="scan_2dcode_addme">扫一扫上面的二维码图案，加我好友</string>
+    <string name="share_2code">分享二维码</string>
+    <string name="change_style">换个样式</string>
+    <string name="save_to_MBphone">保存到手机</string>
+    <string name="scan_2dcode">扫描二维码</string>
+    <string name="error_system_findunknow_error">很抱歉! 系统发现未知错误！</string>
     <string name="not_find_company_search">未找到公司位置，请搜索地址</string>
     <string name="visited">已拜访</string>
     <string name="create_meet_task">创建会议任务</string>