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

# Conflicts:
#	WeiChat/src/main/res/values-en/strings.xml
#	WeiChat/src/main/res/values/strings.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -465,7 +465,7 @@ public class FriendDao {
         chatMessage.setFromUserId(friendId);
         chatMessage.setMessageState(ChatMessageListener.MESSAGE_SEND_SUCCESS);
         chatMessage.setTimeSend(TimeUtils.sk_time_current_time());
-        chatMessage.setContent("你们已经是好友了，开始聊天吧");
+        chatMessage.setContent(MyApplication.getInstance().getString(R.string.friend_to_chat));
         chatMessage.setMySend(false);// 表示不是自己发的
         // 往消息表里插入一条记录
         ChatMessageDao.getInstance().saveNewSingleChatMessage(loginUserId, friendId, chatMessage);

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

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.circle;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -8,11 +9,14 @@ 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.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
@@ -57,6 +61,7 @@ import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 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.SystemUtil;
@@ -474,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);
                 }
             });
@@ -617,13 +622,15 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     public void phoneAction(final String phone) {
-        MaterialDialog dialog = new MaterialDialog.Builder(this).title(getString(R.string.dialog_confim_phone)).content(getString(R.string.dialog_phone)+":" + phone)
+        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(BasicInfoActivity.this, PermissionUtil.DEFAULT_REQUEST, Manifest.permission.CALL_PHONE);
+                        } else doPhone(phone);
+
                     }
 
                     @Override
@@ -636,6 +643,26 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         dialog.show();
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PermissionUtil.DEFAULT_REQUEST) {
+            doPhone(phone_tv.getText().toString());
+        }
+    }
+
+    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);
         editText.setMaxLines(2);
@@ -1027,9 +1054,9 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                             currentStatus);
                     friend.setStatus(currentStatus);
                     updateAllCardcastUi();
-
                     switch (currentStatus) {
                         case Friend.STATUS_ATTENTION:
+                            mFriend.setStatus(Friend.STATUS_ATTENTION);
                             do_next_tv.setText(R.string.say_hello);
                             do_next_tv.setOnClickListener(new SayHelloListener());
                             NewFriendMessage message1 = NewFriendMessage.createWillSendMessage(
@@ -1039,6 +1066,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                             FriendHelper.addAttentionExtraOperation(friend.getOwnerId(), friend.getUserId());
                             break;
                         case Friend.STATUS_FRIEND:
+                            mFriend.setStatus(Friend.STATUS_FRIEND);
                             do_next_tv.setText(R.string.send_msg);
                             do_next_tv.setOnClickListener(new SendMsgListener());
                             NewFriendMessage message2 = NewFriendMessage.createWillSendMessage(

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);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/BaseInfoActivity.java

@@ -129,7 +129,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
         ViewUtils.inject(this);
-
         initView();
     }
 
@@ -167,7 +166,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             mSex = getString(R.string.user_body);
         } else {
             tv_sex.setText(getString(R.string.user_girl));
-            mSex =getString(R.string.user_girl);
+            mSex = getString(R.string.user_girl);
             //  rbGrid.setChecked(true);
         }
         tv_birthday.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
@@ -502,7 +501,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.USER_UPDATE, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                Log.i("gongepngming", "arg0=" + arg0.getMessage());
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 ToastUtil.showErrorNet(BaseInfoActivity.this);
             }
@@ -523,7 +521,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
 
     private void saveData() {
         if (!mUser.getNickName().equals(mTempData.getNickName())) {
-            Log.d("wang", "更新数据库" + mTempData.getNickName());
             MyApplication.getInstance().mLoginUser.setNickName(mTempData.getNickName());
             UserDao.getInstance().updateNickName(mTempData.getUserId(), mTempData.getNickName());// 更新数据库
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetTaskActivity.java

@@ -21,11 +21,11 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.crm.TaskAddActivity;
 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.StringUtils;
+import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 
 import java.util.HashMap;
@@ -67,13 +67,14 @@ public class AddMeetTaskActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_meet_task);
+        getSupportActionBar().setTitle(R.string.meet_task);
         initView();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (R.id.add_item == item.getItemId()) {
-            Intent intent = new Intent(ct, TaskAddActivity.class);
+            Intent intent = new Intent(ct, TaskAddErpActivity.class);
             intent.putExtra("reid", R.style.OAThemeMeet);
             intent.putExtra("type", 2);
             intent.putExtra("isPower", true);
@@ -97,7 +98,7 @@ public class AddMeetTaskActivity extends BaseActivity {
                 handler.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-                        ToastUtil.showToast(ct,R.string.not_power_check_bill);
+                        ToastUtil.showToast(ct, R.string.not_power_check_bill);
                     }
                 }, 1000);
             else
@@ -220,7 +221,7 @@ public class AddMeetTaskActivity extends BaseActivity {
             holder.theme_tv.setText(object.containsKey("description") ? object.getString("description") : "");
             holder.status_tv.setText(object.containsKey("ra_status") ? object.getString("ra_status") : "");
             String name = object.containsKey("ra_resourcename") ? object.getString("ra_resourcename") : "";
-            holder.headler_tv.setText(getResources().getString(R.string.resourcer)+":" + (StringUtils.isEmpty(name) ? "无" : name));
+            holder.headler_tv.setText(getResources().getString(R.string.resourcer) + ":" + (StringUtils.isEmpty(name) ? "无" : name));
             if (name != null && name.length() > 0) {
                 String str = name.substring(0, 1);
                 holder.head_img.setText(str == null ? "" : str);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java

@@ -65,7 +65,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
 
         String qzone_select_add = getIntent().getStringExtra("qzone_select_add");
         if (!TextUtils.isEmpty(qzone_select_add) && qzone_select_add.equals("qzone_select_add")) {
-            getSupportActionBar().setTitle("选择位置");
+            getSupportActionBar().setTitle(R.string.select_locaton);
         }
         init();
         initView();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SaveMeetActivity.java

@@ -105,7 +105,7 @@ public class SaveMeetActivity extends BaseActivity {
                     break;
                 default:
                     if (System.currentTimeMillis() - oldTime > 20000) {//请求大于20秒
-                        Crouton.makeText(ct, R.string.too_long_to_http);
+                        Crouton.makeText(ct, R.string.networks_out);
                     }
                     JsonValidator validator = new JsonValidator();
                     if (!StringUtils.isEmpty(message) && validator.validate(message)) {
@@ -210,6 +210,11 @@ public class SaveMeetActivity extends BaseActivity {
     private void saveAble(String code, int id) {
         StringBuilder builder = new StringBuilder();
         String chche = "";
+
+
+
+
+
         chche = summary_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
             ToastUtil.showToast(ct, R.string.input_meeting_note);
@@ -239,7 +244,7 @@ public class SaveMeetActivity extends BaseActivity {
     private void updataCode() {
         //获取网络数据
         if (bean == null) {
-            ToastUtil.showToast(this, "系统出错，请稍后再试");
+            ToastUtil.showToast(this, R.string.error_system_findunknow_error);
             return;
         }
         oldTime = System.currentTimeMillis();

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);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/OAAdapter.java

@@ -98,7 +98,7 @@ public class OAAdapter extends BaseAdapter {
             else holder.status_img.setVisibility(View.GONE);
         } else if (model.isVisitRecord()) {
             handler += model.getTime2Str("HH:mm");
-            holder.status_tv.setText("已拜访");
+            holder.status_tv.setText(R.string.visited);
         }
         holder.handler_tv.setText(handler);
         if (model.isMission())

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));
             }

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

@@ -187,7 +187,7 @@ public class AddContactsActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("选择联系人");
+        getSupportActionBar().setTitle(R.string.select_contact);
         mListView = (ListView) findViewById(R.id.list_view);
         mHorizontalListView = (HorizontalListView) findViewById(R.id.horizontal_list_view);
         mOkBtn = (Button) findViewById(R.id.ok_btn);

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

@@ -196,7 +196,7 @@ public class MucChatActivity extends ActionBackActivity
             new Handler().postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    sendNotice("新加入的小伙伴们,快来聊天吧!");
+                    sendNotice(getString(R.string.new_join_son_to_chating));
                     noticeFriendList = null;// 防止重复发送提示消息
                 }
             }, 1000);

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

@@ -284,7 +284,7 @@ public class RoomInfoActivity extends BaseActivity {
             String text = notices.get(0).getText();
             mNoticeTv.setText(text);
         } else {
-            mNoticeTv.setText("暂时无公告");
+            mNoticeTv.setText(R.string.no_notice);
         }
 
         mRoomNameTv.setText(mucRoom.getName());
@@ -293,9 +293,9 @@ public class RoomInfoActivity extends BaseActivity {
         mCountTv.setText(mucRoom.getMaxUserSize() + "");
         int s = FriendDao.getInstance().getFriendStatus(mLoginUserId, mRoom.getUserId());
         if (s == -1) {
-            sc_tv.setText("取消屏蔽群消息");
+            sc_tv.setText(R.string.no_block_room_message);
         } else {
-            sc_tv.setText("屏蔽群消息");
+            sc_tv.setText(R.string.block_room_message);
         }
         mCreateTime.setText(TimeUtils.s_long_2_str(mucRoom.getCreateTime() * 1000));
         String myNickName = "";
@@ -365,11 +365,11 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.banned_voice_rl).setVisibility(View.VISIBLE);
             findViewById(R.id.banned_delete_rl).setVisibility(View.GONE);
             findViewById(R.id.exit_room_rl).setVisibility(View.VISIBLE);
-            btnExit.setText("删除商务群");
+            btnExit.setText(R.string.delete_room);
 
             if (mucRoom.getCategory() == 1) {
                 if (CommonUtil.getSharedPreferences(mContext, "erp_commpany").equals(compName[0])) {
-                    btnExit.setText("删除商务群");
+                    btnExit.setText(R.string.delete_room);
 
                 } else {
                     btnExit.setText("用户未在当前账套上");
@@ -412,12 +412,12 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.shield_chat_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {//屏蔽群消息
-                    if (sc_tv.getText().toString().equals("屏蔽群消息")) {
+                    if (sc_tv.getText().toString().equals(R.string.block_room_message)) {
                         addBlacklist(mRoom);
-                        sc_tv.setText("取消屏蔽群消息");
-                    } else if (sc_tv.getText().toString().equals("取消屏蔽群消息")) {
+                        sc_tv.setText(R.string.no_block_room_message);
+                    } else if (sc_tv.getText().toString().equals(R.string.no_block_room_message)) {
                         removeBlacklist(mRoom);
-                        sc_tv.setText("屏蔽群消息");
+                        sc_tv.setText(R.string.block_room_message);
                     }
                 }
             });
@@ -430,7 +430,7 @@ public class RoomInfoActivity extends BaseActivity {
             if (btnExit == null) {
                 btnExit = (Button) findViewById(R.id.btn_exit);
             }
-            btnExit.setText("退出商务群");
+            btnExit.setText(R.string.exit_room);
             add_manage_rl.setVisibility(View.GONE);
             remove_manage_rl.setVisibility(View.GONE);
             findViewById(R.id.room_name_arrow_img).setVisibility(View.INVISIBLE);
@@ -447,12 +447,12 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.shield_chat_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {//屏蔽群消息
-                    if (sc_tv.getText().toString().equals("屏蔽群消息")) {
+                    if (sc_tv.getText().toString().equals(getString(R.string.block_room_message))) {
                         addBlacklist(mRoom);
-                        sc_tv.setText("取消屏蔽群消息");
-                    } else if (sc_tv.getText().toString().equals("取消屏蔽群消息")) {
+                        sc_tv.setText(R.string.no_block_room_message);
+                    } else if (sc_tv.getText().toString().equals(R.string.no_block_room_message)) {
                         removeBlacklist(mRoom);
-                        sc_tv.setText("屏蔽群消息");
+                        sc_tv.setText(R.string.block_room_message);
                     }
                 }
             });
@@ -502,11 +502,11 @@ public class RoomInfoActivity extends BaseActivity {
         View rootView = LayoutInflater.from(mContext).inflate(R.layout.activity_select_contacts, null);
         ListView list = (ListView) rootView.findViewById(R.id.list_view);
         Button ok_btn = (Button) rootView.findViewById(R.id.ok_btn);
-        ok_btn.setText("确定");
+        ok_btn.setText(R.string.common_sure);
         ListViewAdapter adapter = null;
         String title = null;
         if (h == ADD) {
-            title = "添加管理员";
+            title = getString(R.string.add_administrators);
             members.clear();
             for (int i = 0; i < mMembers.size() - add_minus_count; i++) {
                 if (mMembers.get(i).getRole() == 3) {
@@ -515,7 +515,7 @@ public class RoomInfoActivity extends BaseActivity {
             }
             adapter = new ListViewAdapter(members);
         } else {
-            title = "移除管理员";
+            title = getString(R.string.remove_administrators);
             members.clear();
             for (int i = 0; i < mMembers.size() - add_minus_count; i++) {
                 if (mMembers.get(i).getRole() == 2) {
@@ -583,7 +583,7 @@ public class RoomInfoActivity extends BaseActivity {
             public void onResponse(ObjectResult<Void> result) {
                 boolean success = Result.defaultParser(mContext, result, true);
                 if (success) {
-                    ToastMessage("操作成功");
+                    ToastMessage(getString(R.string.submit_success));
                     dialog.dismiss();
                 }
             }
@@ -658,7 +658,7 @@ public class RoomInfoActivity extends BaseActivity {
         editText.setLines(2);
         editText.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.add_notice).setView(editText)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String text = editText.getText().toString().trim();
@@ -667,7 +667,7 @@ public class RoomInfoActivity extends BaseActivity {
                         }
                         updateRoom(null, text, null);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
 
     }
@@ -689,7 +689,7 @@ public class RoomInfoActivity extends BaseActivity {
             ToastUtil.addEditTextNumChanged(RoomInfoActivity.this, editText, 8);
             editText.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
             builderChangeNickNameDialog = new AlertDialog.Builder(this).setTitle(R.string.change_my_nickname).setView(editText)
-                    .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                    .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             String text = editText.getText().toString().trim();
@@ -698,7 +698,7 @@ public class RoomInfoActivity extends BaseActivity {
                             }
                             updateNickName(text);
                         }
-                    }).setNegativeButton(getString(R.string.cancel), null);
+                    }).setNegativeButton(getString(R.string.common_cancel), null);
 
             builderChangeNickNameDialog.create().show();
             builderChangeNickNameDialog = null;
@@ -714,7 +714,7 @@ public class RoomInfoActivity extends BaseActivity {
         ToastUtil.addEditTextNumChanged(RoomInfoActivity.this, editText, 8);
         editText.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.change_room_name).setView(editText)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String text = editText.getText().toString().trim();
@@ -723,7 +723,7 @@ public class RoomInfoActivity extends BaseActivity {
                         }
                         updateRoom(text, null, null);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -736,7 +736,7 @@ public class RoomInfoActivity extends BaseActivity {
         ToastUtil.addEditTextNumChanged(RoomInfoActivity.this, editText, 20);
         editText.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
         AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.change_room_des).setView(editText)
-                .setPositiveButton(getString(R.string.sure), new DialogInterface.OnClickListener() {
+                .setPositiveButton(getString(R.string.common_sure), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String text = editText.getText().toString().trim();
@@ -745,7 +745,7 @@ public class RoomInfoActivity extends BaseActivity {
                         }
                         updateRoom(null, null, text);
                     }
-                }).setNegativeButton(getString(R.string.cancel), null);
+                }).setNegativeButton(getString(R.string.common_cancel), null);
         builder.create().show();
     }
 
@@ -853,7 +853,7 @@ public class RoomInfoActivity extends BaseActivity {
     }
 
     private void showBanndedVoiceDialog(final int position, final String userId) {
-        CharSequence[] items = new CharSequence[]{"不禁言", "禁言一天", "禁言3天", "禁言一周", "禁言半个月", "禁言一个月"};
+        CharSequence[] items = getResources().getStringArray(R.array.gags_select);
         new AlertDialog.Builder(mContext).setTitle(R.string.banned_voice).setItems(items, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -907,9 +907,9 @@ public class RoomInfoActivity extends BaseActivity {
                 boolean success = Result.defaultParser(mContext, result, true);
                 if (success) {
                     if (time > TimeUtils.sk_time_current_time()) {
-                        ToastUtil.showToast(mContext, "禁言成功");
+                        ToastUtil.showToast(mContext, R.string.gag_success);
                     } else {
-                        ToastUtil.showToast(mContext, "取消禁言成功");
+                        ToastUtil.showToast(mContext, R.string.no_gag_success);
                     }
                     doBannedVoice = false;
                     mAdapter.notifyDataSetInvalidated();
@@ -959,7 +959,7 @@ public class RoomInfoActivity extends BaseActivity {
                     updateCreateFalgToERP(or_id);
                 }
                 ProgressDialogUtil.dismiss(dialog);
-                ToastUtil.showToast(RoomInfoActivity.this, "操作成功！");
+                ToastUtil.showToast(RoomInfoActivity.this, R.string.submit_success);
                 new Handler().postDelayed(new Runnable() {
                     @Override
                     public void run() {

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

@@ -71,7 +71,7 @@ public class SelectNewContactsActivity extends BaseActivity implements OnClickLi
     }
 
     private void initView() {
-        getSupportActionBar().setTitle("选择联系人");
+        getSupportActionBar().setTitle(R.string.select_contact);
         mPullToRefreshListView = (PullToRefreshListView) findViewById(R.id.pull_refresh_list);
         View headView = View.inflate(this, R.layout.item_headview_creategroup_chat, null);
         mPullToRefreshListView.getRefreshableView().addHeaderView(headView);

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;
@@ -60,6 +61,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private String[] tagValues;
     private int save = 0;
     private String selectCode = null;
+    private int type = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -72,12 +74,31 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         ViewUtils.inject(this);
         ct = this;
         TAG = "TaskAddErpActivity";
-        getSupportActionBar().setTitle(getString(R.string.task_add));
-        String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
+        int title = R.string.oacreat_calender;
+        String people = "";
+        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:
+                    title = R.string.oacreat_calender;
+                    break;
+                case 2:
+                    title = R.string.create_meet_task;
+                    et_title.setText(intent.getStringExtra("meetname"));
+                    et_title.setFocusable(false);
+                    break;
+                default:
+                    title = R.string.task_add;
+            }
+        }
         if (!StringUtils.isEmpty(people)) {
             et_task_people.setTags(people);
             selectNames = people;
         }
+        getSupportActionBar().setTitle(title);
         iv_find.setOnClickListener(this);
         et_startime.setOnClickListener(this);
         et_endtime.setOnClickListener(this);
@@ -239,8 +260,16 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
     private void doHttpSave(String resourcename) {
         save = 1;
         progressDialog.show();
+        String taskorschedule;
+        if (type == 1) {
+            taskorschedule = "Schedule";
+        } else if (type == 2) {
+            taskorschedule = "MTask";
+        } else {
+            taskorschedule = "Task";
+        }
         Map<String, Object> formStoreMap = new HashMap<>();
-        formStoreMap.put("taskorschedule", "Task");
+        formStoreMap.put("taskorschedule", taskorschedule);
         formStoreMap.put("startdate", et_startime.getText().toString() + ":00");
         formStoreMap.put("enddate", et_endtime.getText().toString() + ":00");
         formStoreMap.put("name", et_title.getText().toString());

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/stream/PermissionHelper.java

@@ -5,12 +5,9 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.util.PermissionUtil;
 
-import static com.umeng.socialize.utils.DeviceConfig.context;
-
 /**
  * Created by Bitliker on 2017/6/5.
  */
@@ -59,7 +56,7 @@ public class PermissionHelper {
         } else {
             PackageManager pm = activity.getPackageManager();
             for (String permission : permissions)
-                if (pm.checkPermission(permission, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
+                if (pm.checkPermission(permission, activity.getPackageName()) == PackageManager.PERMISSION_GRANTED)
                     return true;
         }
         return false;
@@ -67,7 +64,6 @@ public class PermissionHelper {
 
     // 判断是否缺少权限
     private boolean lacksPermission(String permission) {
-        return ContextCompat.checkSelfPermission(activity, permission) ==
-                PackageManager.PERMISSION_DENIED;
+        return ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_DENIED;
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/ChatContentView.java

@@ -34,7 +34,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -859,7 +858,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     CardViewHolder cardViewHolder = (CardViewHolder) contentViewHolder;
                     if (!TextUtils.isEmpty(message.getContent())) {
                         cardViewHolder.chat_head_iv.setVisibility(VISIBLE);
-                        cardViewHolder.chat_person_name.setText("昵称:" + message.getContent());
+                        cardViewHolder.chat_person_name.setText(MyApplication.getInstance().getString(R.string.user_nickname) + message.getContent());
                         AvatarHelper.getInstance().displayAvatar(message.getObjectId(), cardViewHolder.chat_warp_head, true);
                         if (!message.isMySend()) {
                             cardViewHolder.card_progress.setVisibility(GONE);
@@ -1244,7 +1243,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                     ((Activity) mContext).finish();
                     break;
                 case R.id.btn_delete:// 删除
-                    Toast.makeText(mContext, "已成功删除", Toast.LENGTH_SHORT).show();
+                    ToastUtil.showToast(mContext, R.string.delete_all_succ);
               /* if(mChatMessages!=null){
                    mChatMessages.remove(position);
                }*/

WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/CoreService.java

@@ -165,21 +165,7 @@ public class CoreService extends Service {
         registerReceiver(broadcastReceiver, filter);*/
     }
 
-    /*BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
 
-        @Override
-        public void onReceive(Context context, Intent intent) {
-                String userId=intent.getStringExtra(Constants.GROUP_JOIN_NOTICE_FRIEND_ID);
-            String roomJid=intent.getStringExtra(AppConstant.EXTRA_USER_ID);
-            ChatMessage message = new ChatMessage();
-            message.setType(XmppMessage.TYPE_TIP);
-            message.setContent("新加入群的小伙伴,快来聊天吧!");
-            message.setFromUserName(mLoginNickName);
-            message.setFromUserId(mLoginUserId);
-            message.setTimeSend(TimeUtils.sk_time_current_time());
-            sendMucChatMessage(roomJid,message);
-        }
-    };*/
     @Override
     public IBinder onBind(Intent intent) {// 绑定服务只是为了提供一些外部调用的方法
         if (CoreService.DEBUG) {

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

@@ -19,27 +19,26 @@
             <TextView
                 android:id="@+id/name_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议名称"
+                android:text="@string/meeting_name"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
             <ImageView
                 android:id="@+id/voice_name_iv"
-                android:background="@drawable/btn_yuyin_nor"
-                android:visibility="visible"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/name_tag"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
-                />
+                android:layout_marginRight="35dp"
+                android:layout_toRightOf="@+id/name_tag"
+                android:background="@drawable/btn_yuyin_nor"
+                android:visibility="visible" />
 
             <EditText
                 android:id="@+id/name_et"
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/name_tag"
-                android:hint="请输入"
+                android:hint="@string/common_input"
                 android:inputType="text" />
         </RelativeLayout>
 
@@ -56,7 +55,7 @@
             <TextView
                 android:id="@+id/start_tag"
                 style="@style/form_relative_left_text"
-                android:text="开始时间"
+                android:text="@string/task_starttime"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -73,7 +72,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/start_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="请选择" />
+                android:hint="@string/common_select" />
         </RelativeLayout>
 
         <View
@@ -88,7 +87,7 @@
             <TextView
                 android:id="@+id/end_tag"
                 style="@style/form_relative_left_text"
-                android:text="结束时间"
+                android:text="@string/task_endtime"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -105,7 +104,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/end_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="请选择" />
+                android:hint="@string/common_select" />
         </RelativeLayout>
 
         <View
@@ -120,7 +119,7 @@
             <TextView
                 android:id="@+id/location_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议地点"
+                android:text="@string/meet_position"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -136,8 +135,8 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/location_tag"
-                android:hint="请选择"
                 android:drawableRight="@drawable/oa_next"
+                android:hint="@string/common_select"
                 android:lines="1" />
         </RelativeLayout>
 
@@ -170,7 +169,7 @@
             <TextView
                 android:id="@+id/users_tag"
                 style="@style/form_relative_left_text"
-                android:text="参会人员"
+                android:text="@string/join_numer"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -188,11 +187,11 @@
                 android:layout_toRightOf="@+id/users_tag"
                 android:drawableRight="@drawable/oa_next"
                 android:ellipsize="end"
-                android:hint="请选择"
-                android:minLines="1"
+                android:hint="@string/common_select"
                 android:maxLines="4"
+                android:minLines="1"
 
-              />
+                />
         </RelativeLayout>
 
         <View
@@ -207,7 +206,7 @@
             <TextView
                 android:id="@+id/user_tag"
                 style="@style/form_relative_left_text"
-                android:text="管理员"
+                android:text="@string/administrators"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -240,7 +239,7 @@
             <TextView
                 android:id="@+id/tag_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议标签"
+                android:text="@string/meet_tag"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -250,7 +249,7 @@
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@+id/tag_tag"
                 android:drawableRight="@drawable/oa_next"
-                android:hint="请选择" />
+                android:hint="@string/common_select_not_must" />
         </RelativeLayout>
 
         <RelativeLayout
@@ -261,7 +260,7 @@
             <TextView
                 android:id="@+id/about_tag"
                 style="@style/form_relative_left_text"
-                android:text="会议介绍"
+                android:text="@string/meet_show"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -270,17 +269,17 @@
                 style="@style/add_meet_tv"
                 android:layout_marginLeft="20dp"
                 android:layout_toRightOf="@id/about_tag"
-                android:hint="请输入" />
+                android:hint="@string/common_input1" />
+
             <ImageView
                 android:id="@+id/voice_introduce_iv"
-                android:background="@drawable/btn_yuyin_nor"
-                android:visibility="visible"
-                android:layout_marginRight="35dp"
-                android:layout_toRightOf="@+id/about_tag"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
-                />
+                android:layout_marginRight="35dp"
+                android:layout_toRightOf="@+id/about_tag"
+                android:background="@drawable/btn_yuyin_nor"
+                android:visibility="visible" />
         </RelativeLayout>
 
         <View
@@ -293,7 +292,7 @@
 
             <TextView
                 style="@style/form_relative_left_text"
-                android:text="为参会人员创建日程："
+                android:text="@string/add_schedule_for_meeter"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -311,7 +310,7 @@
             style="@style/from_button_base_bule"
             android:layout_marginBottom="30dp"
             android:layout_marginTop="20dp"
-            android:text="保  存"
+            android:text="@string/common_save_button"
             android:visibility="gone" />
     </LinearLayout>
 </ScrollView>

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

@@ -51,7 +51,7 @@
             android:layout_marginBottom="5dp"
             android:layout_marginTop="5dp"
             android:padding="5dp"
-            android:text="不显示位置"
+            android:text="@string/qzone_notshow_location"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main"
             android:visibility="visible" />

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"

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>

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>

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

@@ -18,7 +18,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text="群名称"
+            android:text="@string/room_name"
             android:textSize="@dimen/text_main" />
 
         <com.xzjmyk.pm.activity.view.ClearEditText
@@ -30,7 +30,7 @@
             android:layout_toRightOf="@+id/tv_room_name"
             android:background="@color/item_color2"
             android:drawablePadding="5dp"
-            android:hint="输入名称"
+            android:hint="@string/common_input"
             android:inputType="text"
             android:textSize="@dimen/text_hine" />
 
@@ -52,7 +52,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text="群说明"
+            android:text="@string/room_description"
             android:textSize="@dimen/text_main"
 
             />
@@ -66,7 +66,7 @@
             android:layout_toRightOf="@+id/tv_room_doc"
             android:background="@color/item_color2"
             android:drawablePadding="5dp"
-            android:hint="输入说明"
+            android:hint="@string/common_input"
             android:inputType="text"
 
             android:textSize="@dimen/text_hine" />
@@ -78,9 +78,10 @@
         android:id="@+id/creater"
         android:layout_width="match_parent"
         android:layout_height="@dimen/item_height"
+        android:background="@color/item_color1"
         android:layout_below="@+id/rl_room_doc"
-        android:layout_marginTop="@dimen/line_min"
-        android:background="@color/item_color1">
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
 
         <TextView
             android:layout_width="wrap_content"
@@ -88,7 +89,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text="创  建  者"
+            android:text="@string/creater"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -99,7 +100,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text=" 周兵"
+
             android:textSize="@dimen/text_hine" />
     </RelativeLayout>
 
@@ -117,7 +118,7 @@
             android:layout_marginLeft="18dp"
             android:layout_marginRight="18dp"
             android:gravity="center_vertical"
-            android:text="人       数"
+            android:text="@string/room_number"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -144,7 +145,7 @@
         android:layout_marginTop="9dp"
         android:gravity="center"
         android:textSize="@dimen/text_main"
-        android:text="确    定"
+        android:text="@string/common_sure"
         android:textColor="@color/white"
         />
 

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

@@ -17,5 +17,5 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/empty_img"
         android:layout_centerHorizontal="true"
-        android:text="未找到公司位置，请搜索地址" />
+        android:text="@string/not_find_company_search" />
 </RelativeLayout>

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">
 
 

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">
 
 

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">
 

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

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

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

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">

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

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" />
 

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"

WeiChat/src/main/res/values-zh-rCN/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">Shenzhen You soft Technology Co., Ltd</string>
@@ -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,11 +690,103 @@
     <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">人       数</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-->
@@ -857,7 +948,7 @@
     <string name="task_detail">任务详情</string>
     <string name="task_executor">执行人</string>
     <string name="task_starttime">开始时间</string>
-    <string name="task_endtime">截止时间</string>
+    <string name="task_endtimetask_endtime">截止时间</string>
     <!--任务详情-->
     <string name="taskdetail_title">任务处理</string>
     <string name="taskdetail_info">任务信息</string>
@@ -926,7 +1017,7 @@
     <string name="umeng_socialize_text_tencent_no_install">未安装腾讯微博客户端</string>
     <string name="umeng_socialize_text_waitting">请稍候...</string>
     <string name="umeng_socialize_text_waitting_weixin">跳转微信中，请稍候...</string>
-    <string name="umeng_socialize_text_waitting_weixin_circle">跳转朋友圈中，请稍候...</string>
+    <string name="umeng_socialize_text_waitting_weixin_circle">跳转工作圈中，请稍候...</string>
     <string name="umeng_socialize_text_waitting_yixin">跳转易信中，请稍候...</string>
     <string name="umeng_socialize_text_waitting_yixin_circle">跳转易信朋友圈中，请稍候...</string>
     <string name="umeng_socialize_text_waitting_qq">跳转QQ中，请稍候...</string>
@@ -1151,7 +1242,7 @@
     <string name="qzone_notshow_location">不显示位置</string>
     <string name="qzone_ishare_too">我也去分享</string>
     <string name="qzone_share_success">分享成功</string>
-    <string name="qzone_enter_qzone_now">是否立即进入朋友圈查看</string>
+    <string name="qzone_enter_qzone_now">是否立即进入工作圈查看</string>
     <string name="qzone_edit_daily">编写日报</string>
     <string name="qzone_enter_atnow">立即进入</string>
     <string name="qzone_upload_failed">上传失败</string>

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-->
@@ -1135,7 +1231,7 @@
     <string name="qzone_notshow_location">不顯示位置</string>
     <string name="qzone_ishare_too">我也去分享</string>
     <string name="qzone_share_success">分享成功</string>
-    <string name="qzone_enter_qzone_now">是否立即進入朋友圈查看</string>
+    <string name="qzone_enter_qzone_now">是否立即進入工作圈查看</string>
     <string name="qzone_edit_daily">編寫日報</string>
     <string name="qzone_enter_atnow">立即進入</string>
     <string name="qzone_upload_failed">上傳失敗</string>

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>
@@ -1679,4 +1678,36 @@
     <string name="signcard">补卡</string>
     <string name="sure_delete_content">你确定删除该联系人吗</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>
+    <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>