Просмотр исходного кода

添加部分翻译
修复RecyclerView的适配问题

Bitliker 8 лет назад
Родитель
Сommit
b647343e3b
21 измененных файлов с 195 добавлено и 37 удалено
  1. 2 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java
  2. 22 4
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java
  3. 1 1
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/MissionAdapter.java
  4. 3 2
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpService.java
  5. 2 0
      WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java
  6. 6 1
      WeiChat/src/main/res/layout/activity_mission.xml
  7. 7 6
      WeiChat/src/main/res/layout/activity_select_aim.xml
  8. 4 2
      WeiChat/src/main/res/layout/activity_select_remark.xml
  9. 1 1
      WeiChat/src/main/res/layout/item_flights.xml
  10. 1 1
      WeiChat/src/main/res/layout/item_mission.xml
  11. 1 1
      WeiChat/src/main/res/layout/item_remark.xml
  12. 1 1
      WeiChat/src/main/res/layout/item_select_aim_empty.xml
  13. 1 1
      WeiChat/src/main/res/layout/item_select_aim_load.xml
  14. 1 1
      WeiChat/src/main/res/layout/item_select_aim_map.xml
  15. 1 1
      WeiChat/src/main/res/layout/item_subscription_first.xml
  16. 1 1
      WeiChat/src/main/res/layout/item_subscription_time.xml
  17. 5 5
      WeiChat/src/main/res/layout/message_dialog.xml
  18. 1 1
      WeiChat/src/main/res/layout/recycler_empty_view.xml
  19. 5 3
      WeiChat/src/main/res/values-zh-rCN/strings.xml
  20. 97 1
      WeiChat/src/main/res/values-zh-rTW/strings.xml
  21. 32 1
      WeiChat/src/main/res/values/strings.xml

+ 2 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BasicInfoActivity.java

@@ -479,8 +479,8 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         mIntent = new Intent(BasicInfoActivity.this, TaskAddB2BActivity.class).putExtra("people", userName);
                     else
                         mIntent = new Intent(BasicInfoActivity.this, TaskAddErpActivity.class).putExtra("people", userName);
-                    mIntent.putExtra("people", name_tv.getText().toString());
-                    mIntent.putExtra(AppConstant.EXTRA_EM_CODE, emcode);
+                    mIntent.putExtra("people", name_tv.getText().toString())
+                            .putExtra(AppConstant.EXTRA_EM_CODE, emcode);
                     startActivity(mIntent);
                 }
             });

+ 22 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/view/CardInfoActivity.java

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.circle.view;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -8,11 +9,13 @@ import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.support.v4.app.ActivityCompat;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
@@ -51,10 +54,12 @@ import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
+import com.xzjmyk.pm.activity.util.PermissionUtil;
 import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -547,13 +552,15 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     public void phoneAction(final String phone) {
-        MaterialDialog dialog = new MaterialDialog.Builder(this).title("确认是否拨打电话").content("手机号码:" + phone)
-                .positiveText("拨打").negativeText("取消").autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
+        MaterialDialog dialog = new MaterialDialog.Builder(this).title(getString(R.string.dialog_confim_phone)).content(getString(R.string.dialog_phone) + ":" + phone)
+                .positiveText(getString(R.string.dialog_phone_action)).negativeText(getString(R.string.common_cancel)).autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
                     @Override
                     public void onPositive(MaterialDialog dialog) {
                         // 用intent启动拨打电话
-                        Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
-                        startActivity(intent);
+                        if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CALL_PHONE)) {
+                            PermissionUtil.requestPermission(CardInfoActivity.this, PermissionUtil.DEFAULT_REQUEST, Manifest.permission.CALL_PHONE);
+                        } else doPhone(phone);
+
                     }
 
                     @Override
@@ -565,6 +572,17 @@ public class CardInfoActivity extends BaseActivity implements NewFriendListener
 
         dialog.show();
     }
+    private void doPhone(String phone) {
+        if (!com.xzjmyk.pm.activity.util.StringUtils.isMobileNumber(phone)) {
+            ToastUtil.showToast(ct, R.string.phone_number_format_error);
+            return;
+        }
+        if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CALL_PHONE) != PackageManager.PERMISSION_GRANTED) {
+            ToastUtil.showToast(ct, R.string.not_system_permission);
+            return;
+        }
+        startActivity(new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone)));
+    }
 
     public void doSayHello() {
         final EditText editText = new EditText(this);

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

@@ -43,7 +43,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.BaseView
 
     @Override
     public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(ct).inflate(R.layout.item_mission, parent, false);
+        View view = LayoutInflater.from(ct).inflate(R.layout.item_mission,null);
         return new BaseViewHolder(view);
     }
 

+ 3 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpService.java

@@ -123,6 +123,7 @@ public class AutoErpService extends Service {
                 if (intent == null || StringUtils.isEmpty(intent.getAction())) return;
                 else if (intent.getAction().equals(UPDATA_ERP_CHANGE) || intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更,重新刷新数据,初始化任务
                     log(UPDATA_ERP_CHANGE);
+                    CommonInterface.getInstance().judgeManager(null);
                     init();
                 } else if (intent.getAction().equals(CHANGE_WORK_TASK)) {//自动打卡任务变更
                     log(CHANGE_WORK_TASK);
@@ -383,8 +384,8 @@ public class AutoErpService extends Service {
     /*初始化外勤 */
     private void initMission() throws Exception {
         if (!MyApplication.getInstance().isNetworkActive()) {
-            boolean isHas=MissionDao.getInstance().hasMoreMision();
-            LogUtil.i("isHas="+isHas);
+            boolean isHas = MissionDao.getInstance().hasMoreMision();
+            LogUtil.i("isHas=" + isHas);
             if (PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false) && isHas) {
                 CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), getString(R.string.common_notlinknet));
             }

+ 2 - 0
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -17,6 +17,7 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.AppConstant;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectEmUser;
@@ -78,6 +79,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         Intent intent = getIntent();
         if (intent != null) {
             people = intent.getStringExtra("people");
+            selectCode = intent.getStringExtra(AppConstant.EXTRA_EM_CODE);
             type = intent.getIntExtra("type", 0);
             switch (type) {
                 case 1:

+ 6 - 1
WeiChat/src/main/res/layout/activity_mission.xml

@@ -11,12 +11,17 @@
         android:focusableInTouchMode="true"
         android:orientation="vertical">
 
-
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:descendantFocusability="blocksDescendants">
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        </RelativeLayout>
+
         <TextView
             android:id="@+id/additem_tv"
             android:layout_width="match_parent"

+ 7 - 6
WeiChat/src/main/res/layout/activity_select_aim.xml

@@ -39,10 +39,11 @@
         android:layout_weight="3"
         android:clickable="false" />
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/listview"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="5"
-        android:dividerHeight="1dp" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/listview"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="5"
+            android:dividerHeight="1dp" />
 </LinearLayout>

+ 4 - 2
WeiChat/src/main/res/layout/activity_select_remark.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity">
+
     <RelativeLayout
         android:id="@+id/meet_select_rl"
         android:layout_width="match_parent"
@@ -28,9 +29,10 @@
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
     </RelativeLayout>
+
     <android.support.v7.widget.RecyclerView
-        android:layout_below="@+id/meet_select_rl"
         android:id="@+id/recyclerview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:layout_below="@+id/meet_select_rl" />
 </RelativeLayout>

+ 1 - 1
WeiChat/src/main/res/layout/item_flights.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="10dp">
 
 

+ 1 - 1
WeiChat/src/main/res/layout/item_mission.xml

@@ -1,7 +1,7 @@
 <?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="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
 

+ 1 - 1
WeiChat/src/main/res/layout/item_remark.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/selector_me_menu_item_bg"
     android:padding="10dp">
 

+ 1 - 1
WeiChat/src/main/res/layout/item_select_aim_empty.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="10dp">
 
     <ImageView

+ 1 - 1
WeiChat/src/main/res/layout/item_select_aim_load.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="10dp">
 
     <TextView

+ 1 - 1
WeiChat/src/main/res/layout/item_select_aim_map.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="10dp">
 
     <TextView

+ 1 - 1
WeiChat/src/main/res/layout/item_subscription_first.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:padding="10dp"
     android:background="@color/white"
     android:orientation="vertical">

+ 1 - 1
WeiChat/src/main/res/layout/item_subscription_time.xml

@@ -1,7 +1,7 @@
 <?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="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <TextView

+ 5 - 5
WeiChat/src/main/res/layout/message_dialog.xml

@@ -24,7 +24,7 @@
             android:layout_marginRight="20dip"
             android:layout_marginTop="20dip"
             android:background="@drawable/btn_dialog_selector"
-            android:text="复   制"
+            android:text="@string/copy"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
 
@@ -36,7 +36,7 @@
             android:layout_marginRight="20dip"
             android:layout_marginTop="15dip"
             android:background="@drawable/btn_dialog_selector"
-            android:text="转   发"
+            android:text="@string/forward"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
 
@@ -48,7 +48,7 @@
             android:layout_marginRight="20dip"
             android:layout_marginTop="15dip"
             android:background="@drawable/btn_dialog_selector"
-            android:text="删   除"
+            android:text="@string/delete"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
 
@@ -60,7 +60,7 @@
             android:layout_marginRight="20dip"
             android:layout_marginTop="15dip"
             android:background="@drawable/btn_dialog_selector"
-            android:text="更   多"
+            android:text="@string/more"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
 
@@ -73,7 +73,7 @@
             android:layout_marginRight="20dip"
             android:layout_marginTop="15dip"
             android:background="@drawable/btn_dialog_selector"
-            android:text="取   消"
+            android:text="@string/common_cancel"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
 

+ 1 - 1
WeiChat/src/main/res/layout/recycler_empty_view.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:orientation="vertical"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <View
         android:id="@+id/top"

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

@@ -683,7 +683,6 @@
     <string name="input_meeting_resolution">会议决议未按要求填写</string>
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
-
     <string name="leave">请假</string>
     <string name="overtime">加班</string>
     <string name="ychuqin">应该出勤</string>
@@ -691,7 +690,6 @@
     <string name="nday">正常打卡</string>
     <string name="outdays">出差</string>
     <string name="signcard">补卡</string>
-
     <string name="add_blacklist">加入黑名单</string>
     <string name="cancel_attention">取消关注</string>
     <string name="delete_all">彻底删除</string>
@@ -750,7 +748,7 @@
     <string name="delete_room">删除商务群</string>
     <string name="exit_room">退出商务群</string>
     <string name="add_administrators">添加管理员</string>
-    <string name="remove_administrators">添加管理员</string>
+    <string name="remove_administrators">移除管理员</string>
     <string name="room_info">群信息</string>
     <string name="notice">群内公告</string>
     <string name="room_desc">群说明</string>
@@ -776,6 +774,10 @@
     <string name="friendly_time_before_minute">分钟前</string>
     <string name="friendly_time_yesterday">昨天</string>
     <string name="friendly_time_before_yesterday">前天</string>
+    <string name="copy">复&#160;&#160;制</string>
+    <string name="forward">转&#160;&#160;发</string>
+    <string name="delete">删&#160;&#160;除</string>
+    <string name="more">更&#160;&#160;多</string>
     <string-array name="gags_select">
         <item>不禁言</item>
         <item>禁言一天</item>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- start公用部分-->
     <string name="uas_company_name">深圳市優軟科技有限公司</string>
     <string name="common_save_button">保存</string>
@@ -662,6 +662,102 @@
     <string name="nday">正常打卡</string>
     <string name="outdays">出差</string>
     <string name="signcard">補卡</string>
+    <string name="add_blacklist">加入黑名單</string>
+    <string name="cancel_attention">取消關注</string>
+    <string name="delete_all">徹底删除</string>
+    <string name="remark_name_format_error">備註名不合法,只允許中文、英文、字母和底線,且長度為3至10個字元</string>
+    <string name="not_find_company_search">未找到公司位置,請蒐索地址</string>
+    <string name="visited">已拜訪</string>
+    <string name="create_meet_task">創建會議任務</string>
+    <string name="meeting_name">會議名稱</string>
+    <string name="join_numer">參會人員</string>
+    <string name="administrators">管理員</string>
+    <string name="add_schedule_for_meeter">為參會人員創建日程</string>
+    <string name="select_locaton">選擇位置</string>
+    <string name="friend_to_chat">你們已經是好友了,<開始聊天吧></開始聊天吧></string>
+    <string name="not_system_permission">應用沒有獲取到許可權</string>
+    <string name="chat_poto">照片</string>
+    <string name="chat_camera">拍照</string>
+    <string name="chat_video">錄影</string>
+    <string name="chat_audio">語音通話</string>
+    <string name="chat_loc">位置</string>
+    <string name="chat_file">檔案</string>
+    <string name="chat_card">名片</string>
+    <string name="send">發送 </string>
+    <string name="motalk_voice_chat_tip_1">按住說話</string>
+    <string name="motalk_voice_chat_tip_2">鬆開發送</string>
+    <string name="motalk_voice_chat_tip_3">上滑取消發送</string>
+    <string name="motalk_voice_chat_tip_4">鬆開取消發送</string>
+    <string name="motalk_voice_chat_tip_5">重新錄製</string>
+    <string name="motalk_voice_chat_tip_6">鬆開結束</string>
+    <string name="msg_picture">[圖片]</string>
+    <string name="msg_voice">[語音]</string>
+    <string name="msg_location">[位置]</string>
+    <string name="msg_animation">[動畫]</string>
+    <string name="msg_video">[視頻]</string>
+    <string name="msg_file">[檔案]</string>
+    <string name="msg_be_add_attention">有人關注了你</string>
+    <string name="msg_be_say_hello">有人給你打招呼</string>
+    <string name="msg_be_passed">你通過了好友驗證</string>
+    <string name="msg_has_new_friend">你有新朋友了</string>
+    <string name="msg_has_new_recommend_friend">你有新的推薦朋友</string>
+    <string name="add_chat_ok_btn">確定(<xliff:g id="count">%1$s</xliff:g>)</string>
+    <string name="select_contacts">選擇連絡人</string>
+    <string name="please_input_room_name">請輸入群名</string>
+    <string name="please_input_room_desc">請輸入群描述</string>
+    <string name="service_start_failed">您當前處於離線狀態,請檢查網絡或重新登陸</string>
+    <string name="create_room">創建群</string>
+    <string name="room_name_empty_error">群名不能為空</string>
+    <string name="room_des_empty_error">群描述不能為空</string>
+    <string name="create_room_failed">創建群失敗</string>
+    <string name="room_name">群名稱</string>
+    <string name="room_description">群說明</string>
+    <string name="room_number">人&#160;&#160;&#160;&#160;數</string>
+    <string name="new_join_son_to_chating">新加入的小夥伴們,快來聊天吧!</string>
+    <string name="no_notice">暫時無公告</string>
+    <string name="no_block_room_message">取消遮罩群消息</string>
+    <string name="block_room_message">遮罩群消息</string>
+    <string name="delete_room">删除商務群</string>
+    <string name="exit_room">退出商務群</string>
+    <string name="add_administrators">添加管理員</string>
+    <string name="remove_administrators">移除管理員</string>
+    <string name="room_info">群資訊</string>
+    <string name="notice">群內公告</string>
+    <string name="room_desc">群內公告</string>
+    <string name="creator">創建者</string>
+    <string name="people_count">成員上限</string>
+    <string name="my_nick_name">我的群昵稱</string>
+    <string name="can_not_remove_self">你不能移除你自己</string>
+    <string name="can_not_banned_self">你不能禁言你自己</string>
+    <string name="banned_voice">禁言</string>
+    <string name="banned_exit_room">退出群</string>
+    <string name="banned_delete_room">解散群</string>
+    <string name="create_chat_time">創建時間</string>
+    <string name="shield_chat">遮罩群消息</string>
+    <string name="change_room_name">修改群名</string>
+    <string name="change_room_des">修改群說明</string>
+    <string name="change_my_nickname">修改我的群昵稱</string>
+    <string name="add_notice">添加公告</string>
+    <string name="please_wait">請稍等&#8230;</string>
+    <string name="gag_success">禁言成功</string>
+    <string name="no_gag_success">取消禁言成功</string>
+    <string name="to_this_day">至今</string>
+    <string name="friendly_time_before_seconds">秒前</string>
+    <string name="friendly_time_before_minute">分鐘前</string>
+    <string name="friendly_time_yesterday">昨天</string>
+    <string name="friendly_time_before_yesterday">前天</string>
+    <string name="copy">複&#160;&#160;制</string>
+    <string name="forward">轉&#160;&#160;發</string>
+    <string name="delete">删&#160;&#160;除</string>
+    <string name="more">更&#160;&#160;多</string>
+    <string-array name="gags_select">
+        <item>不禁言</item>
+        <item>禁言一天</item>
+        <item>禁言3天</item>
+        <item>禁言一周</item>
+        <item>禁言半個月</item>
+        <item>禁言一個月</item>
+    </string-array>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

+ 32 - 1
WeiChat/src/main/res/values/strings.xml

@@ -1664,7 +1664,6 @@
     <string name="input_meeting_resolution">会议决议未按要求填写</string>
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
-
     <string name="crm_icon1">我的排名</string>
     <string name="crm_icon2">本月销售简报</string>
     <string name="crm_icon3">我的下属</string>
@@ -1678,4 +1677,36 @@
     <string name="outdays">出差</string>
     <string name="signcard">补卡</string>
     <string name="sure_delete_content">你确定删除该联系人吗</string>
+    <string name="not_find_company_search">未找到公司位置,请搜索地址</string>
+    <string name="visited">已拜访</string>
+    <string name="create_meet_task">创建会议任务</string>
+    <string name="meeting_name">会议名称</string>
+    <string name="join_numer">参会人员</string>
+    <string name="administrators">管理员</string>
+    <string name="add_schedule_for_meeter">为参会人员创建日程</string>
+    <string name="select_locaton">选择位置</string>
+    <string name="friend_to_chat">你们已经是好友了,开始聊天吧</string>
+    <string name="not_system_permission">应用没有获取到权限</string>
+    <string name="room_description">群说明</string>
+    <string name="room_number">人       数</string>
+    <string name="new_join_son_to_chating">新加入的小伙伴们,快来聊天吧!</string>
+    <string name="no_notice">暂时无公告</string>
+    <string name="no_block_room_message">取消屏蔽群消息</string>
+    <string name="block_room_message">屏蔽群消息</string>
+    <string name="delete_room">删除商务群</string>
+    <string name="exit_room">退出商务群</string>
+    <string name="add_administrators">添加管理员</string>
+    <string name="remove_administrators">移除管理员</string>
+    <string name="gag_success">禁言成功</string>
+    <string name="no_gag_success">取消禁言成功</string>
+    <string name="forward">转&#160;&#160;发</string>
+    <string name="more">更&#160;&#160;多</string>
+    <string-array name="gags_select">
+        <item>不禁言</item>
+        <item>禁言一天</item>
+        <item>禁言3天</item>
+        <item>禁言一周</item>
+        <item>禁言半个月</item>
+        <item>禁言一个月</item>
+    </string-array>
 </resources>