提交代码保存

1.隐藏CRm2.0功能
2.修复个别bug
3.修正个别翻译

WeiChat/src/main/AndroidManifest.xml

@@ -506,7 +506,7 @@
             android:theme="@style/CrmThemeCustomer" />
         <activity
             android:name=".ui.erp.activity.crm.SalesRankingActivity"
-            android:label="@string/title_activity_sales_ranking"
+            android:label="@string/crmmain_wall_of_fame"
             android:theme="@style/CrmThemeRank" />
         <activity
             android:name=".ui.erp.activity.crm.VisitReportAddActivity"
@@ -901,7 +901,9 @@
             android:exported="true" />
         <!-- 计步功能 服务 -->
         <service
-            android:name="com.xzjmyk.pm.newpedo.service.StepService">
+            android:name="com.xzjmyk.pm.newpedo.service.StepService"
+            android:priority="1000"
+            android:process="com.spring.stepcount.service">
             <intent-filter>
 
                 <!-- 系统启动完成后会调用 -->

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -19,6 +19,7 @@ import android.os.PersistableBundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Gravity;
@@ -35,7 +36,10 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
+import com.baidu.autoupdatesdk.AppUpdateInfo;
+import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
+import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.MyApplication;
@@ -601,7 +605,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
                 Intent intent = new Intent(mContext, FeedbackActivity.class);
                 intent.putExtra("type", 1);
                 intent.putExtra(WebViewActivity.EXTRA_URL, mConfig.help_url);
-                intent.putExtra(WebViewActivity.EXTRA_TITLE, getString(R.string.use_help));
+                intent.putExtra(WebViewActivity.EXTRA_TITLE, getString(R.string.Rated_suggest));
                 startActivity(intent);
                 popupWindow.dismiss();
             }
@@ -651,9 +655,32 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
             @Override
             public void onCheckComplete() {
-
+                //发现新版本就初始化这个值保证下次“为UU评分”弹出，直至升级，对：就是这么流氓，叫你不升级我弹死你
+                BDAutoUpdateSDK.cpUpdateCheck(MainActivity.this,
+                        new CPCheckUpdateCallback() {
+
+                            @Override
+                            public void onCheckUpdateCallback(
+                                    AppUpdateInfo info,
+                                    AppUpdateInfoForInstall infoForInstall) {
+                                if (infoForInstall != null
+                                        && !TextUtils
+                                        .isEmpty(infoForInstall
+                                                .getInstallPath())) {
+                                    PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 0);
+                                } else if (info != null) {
+                                    PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 0);
+                                } else {
+//                                    ViewUtil.ShowMessageTitle(
+//                                            MainActivity.this,
+//                                            getString(R.string.set_isnewVersion));
+                                }
+                                progressDialog.dismiss();
+                            }
+                        });
             }
         });
+        Log.i("NEW_VERSION_RATING", PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_VERSION_RATING) + "");
     }
 
 

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

@@ -13,7 +13,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.os.PersistableBundle;
 import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
@@ -444,7 +443,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
         } else {
             do_next_tv.setVisibility(View.VISIBLE);
             if (mFriend == null) {
-                do_next_tv.setText(R.string.add_attention);
+                do_next_tv.setText(R.string.friend_add);
                 do_next_tv.setOnClickListener(new AddAttentionListener());
             } else {
                 switch (mFriend.getStatus()) {
@@ -461,7 +460,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         do_next_tv.setOnClickListener(new SendMsgListener());
                         break;
                     default:// 其他（理论上不可能的哈，容错）
-                        do_next_tv.setText(R.string.add_attention);
+                        do_next_tv.setText(R.string.friend_add);
                         do_next_tv.setOnClickListener(new AddAttentionListener());
                         break;
                 }
@@ -560,7 +559,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                     if (isMatched) {
                         phoneAction(phone_tv.getText().toString());
                     } else {
-                        ViewUtil.ShowMessageTitle(BasicInfoActivity.this, "手机格式不正确！");
+                        ViewUtil.ShowMessageTitle(BasicInfoActivity.this, getString(R.string.error_phone));
                     }
                 }
             }
@@ -604,7 +603,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     private void showCopyTextLongClickDialog(final String phone) {
-        CharSequence[] items = new CharSequence[]{mContext.getString(R.string.copy)};
+        CharSequence[] items = new CharSequence[]{mContext.getString(R.string.qzone_copy)};
         new AlertDialog.Builder(mContext).setItems(items, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -618,7 +617,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
     }
 
     public void phoneAction(final String phone) {
-        MaterialDialog dialog = new MaterialDialog.Builder(this).title("确认是否拨打电话").content("手机号码：" + phone)
+        MaterialDialog dialog = new MaterialDialog.Builder(this).title(getString(R.string.dialog_confim_phone)).content(getString(R.string.dialog_phone)+":" + phone)
                 .positiveText("拨打").negativeText("取消").autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
                     @Override
                     public void onPositive(MaterialDialog dialog) {

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

@@ -90,7 +90,7 @@ public class SalesRankingActivity extends BaseActivity {
     private void initView() {
         ct = this;
         ViewUtils.inject(this);
-       tv_date_title.setText(DateFormatUtil.getStrDate4Date(new Date(),"yyyy年MM月")+"荣誉墙");
+       tv_date_title.setText(DateFormatUtil.getStrDate4Date(new Date(),"yyyy年MM月")+getString(R.string.crmmain_wall_of_fame));
        
     }
 
@@ -120,7 +120,8 @@ public class SalesRankingActivity extends BaseActivity {
                     @Override
                     public void onDatePicked(String year, String month) {
                         sendHttpResquest(Constants.HTTP_SUCCESS_INIT,year+month);
-                        tv_date_title.setText(year+"年"+month+"月荣誉墙");
+                        tv_date_title.setText(year+getString(R.string.shorthand_year)+month+getString(R.string.sShorthand_month)
+                                +getString(R.string.crmmain_wall_of_fame));
                     }
                 });
                 picker.show();
@@ -248,7 +249,7 @@ public class SalesRankingActivity extends BaseActivity {
                         mlist.setAdapter(mAdapter);
                         
                         mlist.setVisibility(View.GONE);
-                        tv_msg.setText("暂无数据");
+                        tv_msg.setText(getString(R.string.crm_nodatas));
                         tv_msg.setVisibility(View.VISIBLE);
                     }
                     break;

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

@@ -267,7 +267,7 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 String url = "";
                 switch (tab_type) {
                     case 1:
-                        title = "待审批";
+                        title = getString(R.string.task_unconfim);
                         if ("transferprocess".equals(model.typecode) || "process".equals(model.typecode) || "".equals(model.typecode)) {
                             url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID;
                         } else if ("procand".equals(model.typecode)) {
@@ -278,11 +278,11 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
 
                         break;
                     case 2:
-                        title = "已审批";
+                        title = getString(R.string.task_confimed);
                         url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID + "%26_do=1";
                         break;
                     case 3:
-                        title = "我发起的";
+                        title = getString(R.string.task_request_me);
                         url = "jsps/mobile/process.jsp?nodeId=" + model.JP_NODEID + "%26_do=1";
                         break;
                 }

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

@@ -133,7 +133,7 @@ public class FlihtsTimeActivity extends OABaseActivity implements View.OnClickLi
             }
             int earlyTime = model.getEarlyTime();
             if (earlyTime != 0) {
-                munber_tv.setText("上班前" + earlyTime + "个小时");
+                munber_tv.setText(getString(R.string.before_work) + earlyTime + getString(R.string.hour));
             }
         } else {
             Bean b = new Bean();

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

@@ -1,15 +1,31 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
+import android.widget.TextView;
 
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 
 public class HolidaysActivity extends BaseActivity {
 
+    @ViewInject(R.id.zq_and_gq)
+    private TextView zq_and_gq;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_holidays);
+        initView();
+        initData();
+    }
+
+    private void initData() {
+        zq_and_gq.setText(getString(R.string.MyAttendanceRules_nationalDay)+"、"
+                +getString(R.string.MyAttendanceRules_MidAutumnFestival));
+    }
+
+    private void initView() {
+        ViewUtils.inject(this);
     }
 }

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

@@ -77,7 +77,7 @@ public class MyRuleSetActivity extends BaseActivity {
             empty_rl.setVisibility(View.VISIBLE);
             if (!isFree) {
                 if (MyApplication.getInstance().isNetworkActive())
-                    empty_tv.setText("无班次，联系管理员");
+                    empty_tv.setText(getString(R.string.no_flights));
                 else empty_tv.setText(R.string.networks_out);
             }
         } else {
@@ -91,7 +91,7 @@ public class MyRuleSetActivity extends BaseActivity {
 
     private void showWorkData() {
         if (isFree) {
-            time_tv.setText("无");
+            time_tv.setText(getString(R.string.no_));
         } else {
             StringBuilder timeShow = new StringBuilder();
             long allTime = 0;
@@ -107,7 +107,7 @@ public class MyRuleSetActivity extends BaseActivity {
             }
             float h = Float.valueOf(allTime) / (60 * 60);
             String hour = float2String(h);
-            timeShow.append("  " + hour + "小时");
+            timeShow.append("  " + hour + getString(R.string.hour));
             time_tv.setText(timeShow.toString());
         }
     }

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

@@ -207,8 +207,8 @@ public class ViewUtil {
     public static void ShowMessageTitle(Context ct, String msg) {
         try {
             if (ct == null || ct.isRestricted()) return;
-            new MaterialDialog.Builder(ct).title("系统提示").content(msg)
-                    .positiveText("关闭").autoDismiss(false)
+            new MaterialDialog.Builder(ct).title(MyApplication.getInstance().getString(R.string.app_dialog_title)).content(msg)
+                    .positiveText(MyApplication.getInstance().getString(R.string.app_dialog_close)).autoDismiss(false)
                     .callback(new ButtonCallback() {
                         @Override
                         public void onPositive(MaterialDialog dialog) {

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

@@ -457,7 +457,7 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
                 ToastMessage(getString(R.string.ss_time_notice2));
             }
             if (absenteeismtime <= leaveearlytime) {
-                ToastMessage(getString(R.string.ss_time_notice2));
+                ToastMessage(getString(R.string.ss_time_notice3));
             }
         }
     }

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/db/StepDataDao.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.xzjmyk.pm.activity.db.DatabaseManager;
 import com.xzjmyk.pm.newpedo.bean.StepEntity;
 
 import java.util.ArrayList;
@@ -16,9 +15,11 @@ import java.util.List;
  */
 
 public class StepDataDao {
+    private StepDBOpenHelper stepHelper;
+    private SQLiteDatabase stepDb;
 
     public StepDataDao(Context context) {
-
+        stepHelper = new StepDBOpenHelper(context);
     }
 
     /**
@@ -27,13 +28,14 @@ public class StepDataDao {
      * @param stepEntity
      */
     public void addNewData(StepEntity stepEntity) {
-        //TODO 获取db的方式统一使用这个，以后的方法里面使用到db的也用这个方式获取，不然有可能出现闪退
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
+
         ContentValues values = new ContentValues();
         values.put("curDate", stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.insert("step", null, values);
-        DatabaseManager.getInstance().closeDatabase();
+
+        stepDb.close();
     }
 
     /**
@@ -43,23 +45,22 @@ public class StepDataDao {
      * @return
      */
     public StepEntity getCurDataByDate(String curDate) {
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
         StepEntity stepEntity = null;
         Cursor cursor = stepDb.query("step", null, null, null, null, null, null);
-
-            while (cursor.moveToNext()) {
-                String date = cursor.getString(cursor.getColumnIndexOrThrow("curDate"));
-                if (curDate.equals(date)) {
-                    String steps = cursor.getString(cursor.getColumnIndexOrThrow("totalSteps"));
-                    stepEntity = new StepEntity(date, steps);
-                    //跳出循环
-                    break;
-                }
+        while (cursor.moveToNext()) {
+            String date = cursor.getString(cursor.getColumnIndexOrThrow("curDate"));
+            if (curDate.equals(date)) {
+                String steps = cursor.getString(cursor.getColumnIndexOrThrow("totalSteps"));
+                stepEntity = new StepEntity(date, steps);
+                //跳出循环
+                break;
             }
-            //关闭数据库
-                cursor.close();
-                DatabaseManager.getInstance().closeDatabase();
-            return stepEntity;
+        }
+        //关闭
+        stepDb.close();
+        cursor.close();
+        return stepEntity;
     }
 
     /**
@@ -69,7 +70,7 @@ public class StepDataDao {
      */
     public List<StepEntity> getAllDatas() {
         List<StepEntity> dataList = new ArrayList<>();
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
         Cursor cursor = stepDb.rawQuery("select * from step", null);
 
         while (cursor.moveToNext()) {
@@ -80,25 +81,24 @@ public class StepDataDao {
         }
 
         //关闭数据库
+        stepDb.close();
         cursor.close();
-        DatabaseManager.getInstance().closeDatabase();
         return dataList;
     }
 
     /**
      * 更新数据
-     *
      * @param stepEntity
      */
     public void updateCurData(StepEntity stepEntity) {
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
 
         ContentValues values = new ContentValues();
-        values.put("curDate", stepEntity.getCurDate());
+        values.put("curDate",stepEntity.getCurDate());
         values.put("totalSteps", stepEntity.getSteps());
         stepDb.update("step", values, "curDate=?", new String[]{stepEntity.getCurDate()});
 
-        DatabaseManager.getInstance().closeDatabase();
+        stepDb.close();
     }
 
 
@@ -108,10 +108,10 @@ public class StepDataDao {
      * @param curDate
      */
     public void deleteCurData(String curDate) {
-        SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
+        stepDb = stepHelper.getReadableDatabase();
 
         if (stepDb.isOpen())
             stepDb.delete("step", "curDate", new String[]{curDate});
-        DatabaseManager.getInstance().closeDatabase();
+        stepDb.close();
     }
 }

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

@@ -479,7 +479,7 @@
                         android:layout_width="70dp"
                         android:layout_gravity="top"
                         android:layout_marginLeft="10dp"
-                        android:text="备注"
+                        android:text="@string/Remarks"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -557,13 +557,13 @@
                 android:id="@+id/bt_fenpei"
                 style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="分配" />
+                android:text="@string/assign" />
 
             <Button
                 android:id="@+id/bt_zhuanyi"
                 style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="转移" />
+                android:text="@string/transfer" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

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

@@ -21,7 +21,7 @@
             android:layout_height="@dimen/item_height_min"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周一"
+            android:text="@string/Monday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 <View
@@ -35,7 +35,7 @@
             android:layout_marginTop="2px"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周二"
+            android:text="@string/Tuesday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
         <View
@@ -49,7 +49,7 @@
             android:layout_marginTop="2px"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周三"
+            android:text="@string/Wednesday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
         <View
@@ -63,7 +63,7 @@
             android:layout_marginTop="2px"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周四"
+            android:text="@string/Thursday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
         <View
@@ -77,7 +77,7 @@
             android:layout_marginTop="2px"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周五"
+            android:text="@string/Friday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
         <View
@@ -91,7 +91,7 @@
             android:layout_marginTop="2px"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周六"
+            android:text="@string/Saturday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
         <View
@@ -105,7 +105,7 @@
             android:layout_marginTop="2px"
             android:button="@drawable/oa_checkbox"
             android:padding="10dp"
-            android:text="周日"
+            android:text="@string/Sunday"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
     </LinearLayout>
@@ -126,7 +126,7 @@
             android:layout_marginTop="30dp"
             android:background="@drawable/bg_bule_btn"
             android:padding="10dp"
-            android:text="@string/save"
+            android:text="@string/common_save_button"
             android:textColor="@color/oa_item_bg"
             android:textSize="@dimen/text_main" />
     </RelativeLayout>

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

@@ -23,7 +23,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="元旦"
+            android:text="@string/MyAttendanceRules_newYearsDay"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main" />
 
@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="12月31日~1月2日  共3天"
+            android:text="@string/holiday_date1"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
     </LinearLayout>
@@ -50,7 +50,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="春节"
+            android:text="@string/MyAttendanceRules_SpringFestival"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main" />
 
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="1月27日~2月2日 共7天 调休;2月4日上班 "
+            android:text="@string/holiday_date2"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
     </LinearLayout>
@@ -76,7 +76,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="清明节"
+            android:text="@string/MyAttendanceRules_QingmingFestival"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main" />
 
@@ -84,7 +84,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="4月2日~4月4日 共3天  调休;4月1日上班"
+            android:text="@string/holiday_date3"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
     </LinearLayout>
@@ -102,7 +102,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="劳动节"
+            android:text="@string/MyAttendanceRules_LaborDay"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main" />
 
@@ -110,7 +110,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="4月29日~5月1日   共3天"
+            android:text="@string/holiday_date4"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
     </LinearLayout>
@@ -128,7 +128,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="端午节"
+            android:text="@string/MyAttendanceRules_TheDragonBoatFestival"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main" />
 
@@ -136,7 +136,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="5月28日~5月30日  共3天  调休;5月27日上班"
+            android:text="@string/holiday_date5"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
     </LinearLayout>
@@ -152,9 +152,10 @@
         android:paddingTop="10dp">
 
         <TextView
+            android:id="@+id/zq_and_gq"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="国庆节、中秋节"
+            android:text="@string/MyAttendanceRules_nationalDay"
             android:textColor="@color/titleBlue"
             android:textSize="@dimen/text_main" />
 
@@ -162,7 +163,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="10月1日~10月8日  共8天  调休;9月30日上班"
+            android:text="@string/holiday_date6"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_hine" />
     </LinearLayout>

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

@@ -19,7 +19,7 @@
             android:layout_centerInParent="true"
             android:drawablePadding="10dp"
             android:drawableTop="@drawable/work_free"
-            android:text="自由打卡"
+            android:text="@string/free_work"
             android:textColor="#e9e9e9e9"
             android:textSize="15sp" />
     </RelativeLayout>
@@ -48,7 +48,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
-                android:text="规则名称"
+                android:text="@string/rule_name"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -81,7 +81,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
-                android:text="排班"
+                android:text="@string/Set_Scheduling"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
         </RelativeLayout>
@@ -101,7 +101,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
-                android:text="排班类型"
+                android:text="@string/Scheduling_type"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
 
@@ -111,7 +111,7 @@
                 android:layout_height="match_parent"
                 android:layout_alignParentRight="true"
                 android:gravity="center_vertical"
-                android:text="正常班次"
+                android:text="@string/Normal_frequency"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
         </RelativeLayout>
@@ -132,7 +132,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
-                android:text="考勤时间"
+                android:text="@string/work_time"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
 
@@ -165,7 +165,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:gravity="center_vertical"
-                android:text="考勤日期"
+                android:text="@string/work_day"
                 android:textColor="@color/text_hine"
                 android:textSize="@dimen/text_hine" />
 
@@ -187,7 +187,7 @@
             android:background="@color/white"
             android:gravity="center_vertical"
             android:paddingLeft="10dp"
-            android:text="遵循法定节假日"
+            android:text="@string/MyAttendanceRules_legalHoliday"
             android:textColor="@color/titleBlue" />
     </LinearLayout>
 </FrameLayout>

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

@@ -46,8 +46,8 @@
             android:layout_marginRight="30dp"
             android:layout_marginTop="10dp"
             android:gravity="center"
-            android:text="这里展示的是当月表现突出的员工，荣誉墙每个月都会更新，若这个月还没上榜，请多加努力，还有机会哟！" />
-
+            android:text="@string/Wall_of_Fame_description"
+            />
         <View style="@style/app_line_horizontal_05p"></View>
     </LinearLayout>
 

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

@@ -71,7 +71,7 @@
         android:layout_height="45dp"
         android:background="@drawable/text_click_bg"
         android:gravity="center"
-        android:text="@string/cancel"
+        android:text="@string/common_cancel"
         android:textColor="@color/red"
         android:textSize="15sp" />
 

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

@@ -4,6 +4,6 @@
     <item
         android:id="@+id/sale_date_select"
         android:icon="@drawable/icon_date"
-        android:title="筛选"
+        android:title="@string/crm_filter"
         app:showAsAction="ifRoom" />
 </menu>

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

@@ -84,10 +84,10 @@
         <string name = "ss_select_time"> Select Time </string>
         <string name = "ss_sign_seted"> Auto Picking </string> is set
         <string name = "ss_sign_closed"> You have turned off auto punch, the system will not be able to automatically punch your card </string>
-        <string name = "ss_sign_close_notice2"> after the closure of the system can not help you automatically punch, confirm off? </string>
-        <string name = "ss_time_notice1"> late arrival time must be less than severe late! </string>
-        <string name = "ss_time_notice2"> Critical late time must be less than absenteeism! </string>
-        <string name = "ss_time_notice3"> The early retirement time must be less than absenteeism! </string>
+        <string name = "ss_sign_close_notice2"> After shutdown, the system can not automatically punch the clock for you to confirm the shutdown? </string>
+        <string name = "ss_time_notice1"> Lateness must be less than the serious lateness! </string>
+        <string name = "ss_time_notice2"> Serious lateness must be less than absenteeism! </string>
+        <string name = "ss_time_notice3"> Departure time must be less than absenteeism! </string>
 
 
         <string-array name = "late_time">
@@ -122,7 +122,7 @@
         <string name = "add_address_first"> Please add the office address </string>
         <string name = "add_office_address"> Add Office Address </string>
         <string name = "select_range"> Select The Range </string>
-        <string name = "edit_office_address_name"> perfect office address name </string>
+        <string name = "edit_office_address_name"> Perfect office address name </string>
         <string name = "detail_address"> Full Address </string>
         <string name = "delete_address_notice1"> Make sure to delete this office address? </string>
     <!-- end 办公地址设置 -->
@@ -160,7 +160,7 @@
         <string name = "daily_approve_notice1"> Please enter the approval advice, or skip this step directly for approval </string>
         <string name = "select_doman"> Select Executor </string>
         <string name = "doc_detaily_deleted"> The document details have been deleted </string>
-        <string name = "make_adeal_success"> operation succeed </string>
+        <string name = "make_adeal_success"> Operation succeeded </string>
         <string name = "delete_doc_notice2"> Confirm to delete the entry in the entry document </string>
     <!-- end工作日报 oaworkdaily-->
 
@@ -188,7 +188,7 @@
          <string name = "zong"> General Manager </string>
     <!-- 我的排名-->
     <string name = "crm_myranking"> My Ranking </string>
-        <string name = "crm_filter"> Screening </string>
+        <string name = "crm_filter"> filter </string>
         <string name = "crm_sales"> Sales Amount </string>
         <string name = "crm_Gross_profit">Gross Profit</string>
         <string name = "crm_Numberofcustome_visits"> Visits </string>
@@ -234,7 +234,7 @@
     <string name = "crm_Sales_briefing_this_month"> this month sales brochure </string>
          <string name = "crm_Back_money">Received Payments </string>
          <string name = "crm_Shipments">Payment of goods </string>
-         <string name = "crm_Numberofbusiness"> number of business opportunities </string>
+         <string name = "crm_Numberofbusiness"> number of Niche </string>
          <string name = "crm_change_business"> business change </string>
          <string name = "crm_Sales_order"> sales order </string>
          <string name = "crm_Numberofvisitors"> Visiting customers </string>
@@ -267,15 +267,15 @@
         <string name = "business_Conversion_rate"> Percent</string>
 
         <string name = "business_stage"> Step </string>
-        <string name = "First_communication"> first communication </string>
-        <string name = "Product_show"> product demo </string>
+        <string name = "First_communication"> Initial communication </string>
+        <string name = "Product_show"> Product demonstration </string>
         <string name = "Project_evaluation"> Project evaluation </string>
-        <string name = "demand_analysis"> requirement analysis </string>
-        <string name = "Sample_offer"> sample quotation </string>
-        <string name = "Business_negotiation"> business negotiation </string>
-        <string name = "Contract_signing"> contract signing </string>
-        <string name = "Seal_the_deal"> complete the transaction </string>
-        <string name = "Many_transactions"> multiple transactions </string>
+        <string name = "demand_analysis"> Demand analysis  </string>
+        <string name = "Sample_offer"> Sample quotation </string>
+        <string name = "Business_negotiation"> Business negotiation </string>
+        <string name = "Contract_signing"> Sign contract </string>
+        <string name = "Seal_the_deal"> Finish transaction </string>
+        <string name = "Many_transactions"> Multiple transactions </string>
         <string name = "click_more"> op three quota,Link more </string>
         <string name = "length_last_gj"> distance from last follow </string>
     <!-- end 商机界面-->
@@ -284,9 +284,9 @@
          <string name = "no_"> no </string>
         <string name="enterprise_license">Business licence</string>
         <string name = "business_add_success"> add business success </string>
-        <string name = "business_name"> Opportunity name </string>
-        <string name = "business_id"> Opportunity number </string>
-        <string name = "business_from"> Opportunity Source </string>
+        <string name = "business_name"> Niche name </string>
+        <string name = "business_id"> Niche number </string>
+        <string name = "business_from"> Niche Source </string>
         <string name = "business_Library"> Business library </string>
         <string name = "current_stage"> Nichestep </string>
         <string name = "Company_Name"> Corporation </string>
@@ -306,10 +306,10 @@
         <string name = "Has_been_scheduled"> On schedule </string>
         <string name = "Will_time_out"> Upcoming timeout</string>
         <string name = "Has_switched_customers"> In Customer</string>
-        <string name = "qiang_business_success"> successfully grab this opportunity </string>
-        <string name = "split_business_success"> Successfully assign business opportunities </string>
-        <string name = "business_limit"> You have exceeded the maximum number of business opportunities </string>
-        <string name = "business_notice1"> go to the opportunity to follow up the business opportunities </string>
+        <string name = "qiang_business_success"> Operation succeeded </string>
+        <string name = "split_business_success"> Successfully assign business Niche </string>
+        <string name = "business_limit"> You have exceeded the maximum number of business Niche </string>
+        <string name = "business_notice1"> View the niche in the niche list </string>
     <!-- start 商机来源-->
     <string name = "Come_to_visit"> come to visit </string>
          <string name = "tel_to_visit"> phone call </string>
@@ -325,7 +325,7 @@
          <string name = "UAS_private_business_library"> UAS private business library </string>
          <string name = "Test_Department_Private_Business_Library"> Test Department Private Business Library </string>
     <!-- end 商机库-->
-    <string name = "business_detail"> Opportunity Details </string>
+    <string name = "business_detail"> Niche Details </string>
          <string name = "creat_time"> Creation time </string>
          <string name = "last_followup_time"> last follow up time </string>
          <string name = "Stage_requirements"> phase request </string>
@@ -362,9 +362,9 @@
          <string name = "client_Huanan_Region"> South China </string>
          <string name = "client_Huabei_Region"> North China </string>
          <string name = "client_Huazhong_Region"> Central China </string>
-         <string name = "client_Southwest_Region"> southwest </string>
-         <string name = "client_North_west_region"> northwest </string>
-         <string name = "client_North_east_area"> northeastern region </string>
+         <string name = "client_Southwest_Region"> Southwest China</string>
+         <string name = "client_North_west_region"> Northwest China</string>
+         <string name = "client_North_east_area"> Northeastern China </string>
          <string name = "client_HongKong_Macao_and_Taiwan_regions"> Hong Kong, Macau and Taiwan </string>
          <string name = "client_other_areas"> other areas </string>
     <!-- end 所属地区-->
@@ -388,7 +388,7 @@
         <string name = "not_today"> The current date can not sign in </string>
         <string name = "show_frist_mac"> This punch will be set to the usual sign phone, whether to continue to sign? </string>
         <string name = "allow_location"> open the "location service" to allow "UU interconnection" to determine your location </string>
-        <string name = "free_work"> free punch </string>
+        <string name = "free_work"> Free punch </string>
         <string name = "this_position">Location</string>
         <string name = "long_company"> distance to  company </string>
         <string name = "meet_position">Address</string>
@@ -467,9 +467,9 @@
         <string name = "meet_task"> Conference Task </string>
         <string name = "my_mission"> my field </string>
         <string name = "add_mission_plan"> + increase field plan </string>
-        <string name = "perfect_company_name"> perfect unit name </string>
+        <string name = "perfect_company_name"> Perfect unit name </string>
         <string name = "company_name"> company name </string>
-        <string name = "skip_operation"> skip this step </string>
+        <string name = "skip_operation"> Skip this step </string>
     <string name = "delete_back_default_work"> After deleting a member, the member automatically returns to the default shift, does it continue? </string>
         <string name = "a_person"> Personal </string>
         <string name = "a"> </string>
@@ -487,31 +487,31 @@
         <string name = "not_null_work_time"> Attendance time can not be empty </string>
         <string name = "not_null_work_day"> Attendance date can not be empty </string>
         <string name = "will_save_conflict"> save this shift will join the conflict department staff, whether to continue? </string>
-        <string name = "add_flihts"> new shift </string>
+        <string name = "add_flihts"> New shift </string>
         <string name = "edit_flihts"> Modify The Punch Table </string>
         <string name = "work_name"> Shift Name </string>
         <string name = "work_time"> Attendance Time </string>
         <string name = "work_day"> Attendance Date </string>
         <string name = "work_department"> Participating In The Department </string>
-        <string name = "and_join_member"> Or Participant </string>
+        <string name = "and_join_member"> Participant </string>
         <string name = "earliest_work_time"> the earliest working time </string>
         <string name = "most_input_three_time"> Half or Whole day </string>
         <string name = "select_earliest_work_time"> Please select the oldest working time </string>
         <string name = "work_not_complete"> working hours are not filled in complete </string>
         <string name = "off_not_complete"> working hours did not fill in complete </string>
-        <string name = "work_up_time">Off duty</string>
-        <string name = "selected"> selected </string>
+        <string name = "work_up_time">working time</string>
+        <string name = "selected"> Selected </string>
         <string name = "cancel_select_all"> Cancel Select All </string>
         <string name = "not_load_ok_fefresh"> did not get the data, try refreshing contacts </string>
-        <string name = "select_all"> all selected </string>
+        <string name = "select_all"> Select all </string>
         <string name = "not_data_to_select_number"> data is empty, no selectable person </string>
         <string name = "time_include_time"> The selected time has a cross, please re-check after submit </string>
-        <string name = "work_time_setting"> time setting </string>
-        <string name = "work_day_setting"> date setting </string>
-        <string name = "holidays"> legal holiday </string>
+        <string name = "work_time_setting"> Time setting </string>
+        <string name = "work_day_setting"> Date setting </string>
+        <string name = "holidays"> Legal holiday </string>
         <string name = "work_statistics">Attendance Statistics </string>
-        <string name = "select_join_department"> select the participating department </string>
-        <string name = "select_join_number"> select participant </string>
+        <string name = "select_join_department"> Select department </string>
+        <string name = "select_join_number"> Select employee </string>
         <string name = "navigation"> Navigation </string>
         <string name = "outoff_work_alert"> leave office scope reminder </string>
         <string name = "not_allowed_name"> If the rule name is empty or contains special characters, please check </string>
@@ -835,7 +835,7 @@
             <item> tune </item>
             <item> breastfeeding </item>
         </string-array>
-        <string name = "add_new_people"> add people </string>
+        <string name = "add_new_people"> Add employee </string>
         <string name = "leave_type"> leave type </string>
         <string name = "leave_reason"> Leave  Application </string>
         <string name = "start_time"> start time </string>
@@ -922,7 +922,7 @@
         <string name = "task_endT_must_input"> The end time is required </string>
         <string name = "task_send_success"> Save successfully </string>
         <string name = "common_send"> Save </string>
-        <string name = "make_adeal_failed"> operation failed </string>
+        <string name = "make_adeal_failed"> Operation failed </string>
         <string name = "rest"> rest </string>
         <string name = "sign_flights"> Shift </string>
         <string name = "select_department_first"> Please select department </string> first
@@ -967,7 +967,7 @@
         <string name = "qzone_comment"> comments </string>
         <string name = "qzone_change_picture"> </string>
         <string name = "qzone_copy"> copy </string>
-        <string name = "qzone_message_detail"> say say details </string>
+        <string name = "qzone_message_detail"> Qzone details </string>
         <string name = "qzone_saveto_phone"> Save to phone </string>
         <string name = "qzone_cancel"> Cancel </string>
         <string name = "qzone_send_notice1"> You have not entered anything </string>
@@ -1033,7 +1033,7 @@
     <string name="select_flights">Choose a punch table</string>
     <string name="delete_prompt">You sure you want to delete it？</string>
     <string name="work_business_me">My business</string>
-    <string name="work_business_find">Commodity_Inquiry</string>
+    <string name="work_business_find">Commodity inquiry</string>
     <string-array name="step_week1">
         <item>SUN</item>
         <item>MON</item>
@@ -1069,7 +1069,7 @@
     <string name="visit_date">Date</string>
     <string name="update_success">update completed</string>
     <string name="visitting_type">Type of visit</string>
-    <string name="connect_businedd">Related business opportunities</string>
+    <string name="connect_businedd">Related Niche</string>
     <string name="visit_content">Content</string>
     <string name="startT_cannott_big_sT">Start time can not be greater than the current system time </string>
     <string name="endT_cannott_big_sT">The cutoff time can not be greater than the current system time</string>
@@ -1086,7 +1086,7 @@
     <string name="province">province</string>
     <string name="city">city</string>
     <string name="county">county</string>
-    <string name="locationing">positioning</string>
+    <string name="locationing">In positioning</string>
     <string name="current_location">Location</string>
     <string name="hot_city">hot city</string>
     <string name="select_city_by_province">select city</string>
@@ -1128,6 +1128,95 @@
     <string name="address">address</string>
     <string name="assign">assign</string>
     <string name="transfer">transfer</string>
+    <string name="contect_is_much"> contact is required</string>
+    <string name="context_is_much">context required</string>
+    <string name="times">period</string>
+    <string name="create_addree">create place</string>
+    <string name="Follow_up_person"> follow-up</string>
+    <string name="add_schedule">add the schedule</string>
+    <string name="add_mission">add outplan</string>
+    <string name="stage_follow">Update step</string>
+    <string name="more_operation">more actions</string>
+    <string name="sure_delete_bc"> Confirm to delete this niche? </string>
+    <string-array name="crm_dialog_followup">
+        <item> release niche</item>
+        <item> niche invalid</item>
+        <item> to new customer</item>
+        <item> associated with existing customer</item>
+    </string-array>
+    <string name="is_must_input">is required</string>
+    <string name="work_off_time">off time</string>
+    <string name="work_sign">work punch</string>
+    <string name="off_sign">get off work punch </string>
+    <string name="CRM_grabBusinessFaild">Operation failed </string>
+    <string name="CRM_sorryYouHaveOverTheBiggestBusinessQuantity">Exceed maximum quantity</string>
+    <string name="CRM_addDate_sorryThisBusinessHaveAdd">Sorry, this business opportunity has been added to the agenda</string>
+    <string name="CRM_businessLose_leaderGetFaild">Operation failed ,try again later</string>
+    <string name="CRM_businessLose_treatmentTime">Deal time</string>
+    <string name="CRM_businessLose_leader">Leader</string>
+    <string name="select_client">Select Customer</string>
+    <string name="CRM_sorryOnlyPickOneClient">>Sorry,you can only select one customer!</string>
+    <string name="CRM_pleasePickClientFirst">Please select a customer firstly</string>
+    <string name="CRM_current_page_change_ecet">The current page data has been changed, please update first and then submit</string>
+    <string name="CRM_unable_ecet">Unable to access the server,try again later</string>
+    <string name="over_latetime">Serious late</string>
+    <string name="work_signin">punch card</string>
+    <string name="unwork_signin">Get off work punch</string>
+    <string name="add_work_times">+Add time</string>
+    <string name="all_work_time">Total working hours</string>
+    <string name="two_hour_before">2 hours before work</string>
+    <string name="earliest_work_signin_time">Earliest time to sign</string>
+    <string name="mobile_signcard">Appeals</string>
+    <string name="mobile_mac">Phone mac address</string>
+    <string name="mobile_change_name">Reason for change</string>
+    <string name="input_reason">Please fill in the reason</string>
+    <string name="change_signin_ok">Complaint Success!</string>
+    <string name="personnel">personnel</string>
+
+    <string name="MyAttendanceRules_legalHoliday">Follow statutory holidays</string>
+    <string name="MyAttendanceRules_newYearsDay">New Year Day</string>
+    <string name="MyAttendanceRules_SpringFestival">Spring Festival</string>
+    <string name="MyAttendanceRules_QingmingFestival">Qingming Festival</string>
+    <string name="MyAttendanceRules_LaborDay">International Labour Da</string>
+    <string name="MyAttendanceRules_TheDragonBoatFestival">Dragon Boat Festival</string>
+    <string name="MyAttendanceRules_nationalDay">National Day</string>
+    <string name="MyAttendanceRules_MidAutumnFestival">Mid-Autumn Festiva</string>
+    <string name="SchedulingSetting_DeleteTitle">Delete?</string>
+    <string name="SchedulingSetting_ConflictDepartment">There are one conflicting departments to view settings</string>
+    <string name="SchedulingSetting_ConflictPerson1">Participant </string>
+    <string name="SchedulingSetting_ConflictPerson2">view the setting</string>
+    <string name="WorkingTime1">WorkingTime1</string>
+    <string name="WorkingTime2">WorkingTime2</string>
+    <string name="WorkingTime3">WorkingTime3</string>
+    <string name="SchedulingTime_SelectReminder">choice is over time</string>
+    <string name="SchedulingTime_SelectBestWorking1">An hour</string>
+    <string name="SchedulingTime_SelectBestWorking2">two hour</string>
+    <string name="SchedulingTime_SelectBestWorking3">three hour</string>
+    <string name="SchedulingTime_SelectBestWorking4">four hour</string>
+    <string name="SchedulingTime_SelectBestWorking5">five hour</string>
+    <string name="SchedulingTime_SelectBestWorking6">six hour</string>
+    <string name="SchedulingTime_SelectBestWorking7">seven hour</string>
+    <string name="ParticipatingPerson_selectedPerson2">employee</string>
+    <string name="rule_name">Rule name</string>
+    <string name="Set_Scheduling">Set Scheduling</string>
+    <string name = "Scheduling_type"> shift type </string>
+    <string name = "Normal_frequency"> normal shifts </string>
+    <string name = "no_flights"> no shifts, contact the administrator </string>
+    <string name = "Monday"> Monday </string>
+    <string name = "Tuesday"> Tuesday </string>
+    <string name = "Wednesday"> Wednesday </string>
+    <string name = "Thursday"> Thursday </string>
+    <string name = "Friday"> Friday </string>
+    <string name = "Saturday"> Saturday </string>
+    <string name = "Sunday"> Sunday </string>
+    <string name = "holiday_date1"> December 31 to January 2 for 3 days </string>
+    <string name = "holiday_date2"> January 27 ~ February 2 a total of 7 days off; February 4 to work </string>
+    <string name = "holiday_date3"> April 2 ~ April 4 a total of 3 days off; April 1 to work </string>
+    <string name = "holiday_date4"> April 29 ~ May 1 for 3 days </string>
+    <string name = "holiday_date5"> May 28 to May 30 for a total of 3 days off; May 27 to work </string>
+    <string name = "holiday_date6"> October 1 ~ October 8 a total of 8 days of retreat; September 30 to work </string>
+    <string name = "hour">hour</string>
+    <string name = "remove_blacklist"> remove the blacklist </string>
     <string name="is_must_input">is required</string>
 
     <string name="contect_is_much">联系人为必填项</string>

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

@@ -990,7 +990,7 @@
     <string name="overwork_detail">加班明细</string>
     <string name="travel_detail">出差明细</string>
     <string name="overwork_detail1">加班明细一</string>
-    <string name="travel_detail1">出差明细一</string>
+    <string name="travel_detail1">出差明细f</string>
     <string name="complaint_doc">申诉单</string>
     <string name="complaint_hour_T">申诉班次时间</string>
     <string name="complaint_reson">申诉理由</string>
@@ -1258,4 +1258,66 @@
     <string name="address">地址</string>
     <string name="assign">分配</string>
     <string name="transfer">转移</string>
+    <string name="work_sign">上班打卡</string>
+    <string name="off_sign">下班打卡</string>
+    <string name="CRM_grabBusinessFaild">抢占商机失败</string>
+    <string name="CRM_sorryYouHaveOverTheBiggestBusinessQuantity">对不起,您已超过最大拥有的商机数量!</string>
+    <string name="CRM_addDate_sorryThisBusinessHaveAdd">对不起，此商机已添加过日程！</string>
+    <string name="CRM_businessLose_leaderGetFaild">获取直属领导数据失败</string>
+    <string name="CRM_businessLose_treatmentTime">处理时间</string>
+    <string name="CRM_businessLose_leader">直属领导</string>
+    <string name="CRM_sorryOnlyPickOneClient">对不起，只能选择一个客户</string>
+    <string name="CRM_pleasePickClientFirst">请先选择客户</string>
+    <string name="CRM_current_page_change_ecet">当前页数据已更改，请先更新，然后提交</string>
+    <string name="CRM_unable_ecet">无法访问服务器，请稍后再试</string>
+
+    <string name="MyAttendanceRules_legalHoliday">遵循法定节假日</string>
+    <string name="MyAttendanceRules_newYearsDay">元旦</string>
+    <string name="MyAttendanceRules_SpringFestival">春节</string>
+    <string name="MyAttendanceRules_QingmingFestival">清明节</string>
+    <string name="MyAttendanceRules_LaborDay">劳动节</string>
+    <string name="MyAttendanceRules_TheDragonBoatFestival">端午节</string>
+    <string name="MyAttendanceRules_nationalDay">国庆节</string>
+    <string name="MyAttendanceRules_MidAutumnFestival">中秋节</string>
+    <string name="SchedulingSetting_DeleteTitle">是否删除该班次</string>
+    <string name="SchedulingSetting_ConflictDepartment">有冲突部门1个，查看设置</string>
+    <string name="SchedulingSetting_ConflictPerson1">有冲突人员</string>
+    <string name="SchedulingSetting_ConflictPerson2">个，查看设置</string>
+    <string name="WorkingTime1">上班时间1</string>
+    <string name="WorkingTime2">上班时间2</string>
+    <string name="WorkingTime3">上班时间3</string>
+    <string name="SchedulingTime_SelectReminder">选择时间超出时间</string>
+    <string name="SchedulingTime_SelectBestWorking1">提前1小时</string>
+    <string name="SchedulingTime_SelectBestWorking2">提前2小时</string>
+    <string name="SchedulingTime_SelectBestWorking3">提前3小时</string>
+    <string name="SchedulingTime_SelectBestWorking4">提前4小时</string>
+    <string name="SchedulingTime_SelectBestWorking5">提前5小时</string>
+    <string name="SchedulingTime_SelectBestWorking6">提前6小时</string>
+    <string name="SchedulingTime_SelectBestWorking7">提前7小时</string>
+    <string name="ParticipatingPerson_selectedPerson2">个人员</string>
+    <string name="rule_name">规则名称</string>
+    <string name="Set_Scheduling">排班</string>
+    <string name="Scheduling_type">排班类型</string>
+    <string name="Normal_frequency">正常班次</string>
+    <string name="no_flights">无班次，联系管理员</string>
+    <string name="Monday">周一</string>
+    <string name="Tuesday">周二</string>
+    <string name="Wednesday">周三</string>
+    <string name="Thursday">周四</string>
+    <string name="Friday">周五</string>
+    <string name="Saturday">周六</string>
+    <string name="Sunday">周日</string>
+    <string name="holiday_date1">12月31日~1月2日  共3天</string>
+    <string name="holiday_date2">1月27日~2月2日 共7天 调休;2月4日上班</string>
+    <string name="holiday_date3">4月2日~4月4日 共3天  调休;4月1日上班</string>
+    <string name="holiday_date4">4月29日~5月1日   共3天</string>
+    <string name="holiday_date5">5月28日~5月30日  共3天  调休;5月27日上班</string>
+    <string name="holiday_date6">10月1日~10月8日  共8天  调休;9月30日上班</string>
+    <string name="before_work">上班前</string>
+    <string name="remove_blacklist">移出黑名单</string>
+    <string name="say_hello">打招呼</string>
+    <string name="send_msg">发消息</string>
+    <string name="say_hello_succ">打招呼成功</string>
+    <string name="add_friend_succ">加好友成功</string>
+    <string name="error_phone">手机格式不正确</string>
 </resources>

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

@@ -1252,4 +1252,58 @@
     <string name="address">地址</string>
     <string name="assign">分配</string>
     <string name="transfer">轉移</string>
+    <string name="work_sign">上班打卡</string>
+    <string name="off_sign">下班打卡</string>
+    <string name="CRM_grabBusinessFaild">搶占商機失敗</string>
+    <string name="CRM_sorryYouHaveOverTheBiggestBusinessQuantity">對不起,您已超過最大擁有的商機數量!</string>
+    <string name="CRM_addDate_sorryThisBusinessHaveAdd">對不起，此商機已添加過日程！</string>
+    <string name="CRM_businessLose_leaderGetFaild">获取直属领导数据失败</string>
+    <string name="CRM_businessLose_treatmentTime">處理時間</string>
+    <string name="CRM_businessLose_leader">直屬領導</string>
+    <string name="CRM_sorryOnlyPickOneClient">>對不起，只能選擇一個客戶</string>
+    <string name="CRM_pleasePickClientFirst">請先選擇客戶</string>
+    <string name="CRM_current_page_change_ecet">當前頁數據已更改，請先更新，然後提交</string>
+    <string name="CRM_unable_ecet">無法訪問服務器，請稍後再試</string>
+    <string name="MyAttendanceRules_legalHoliday">遵循法定節假日</string>
+    <string name="MyAttendanceRules_newYearsDay">元旦</string>
+    <string name="MyAttendanceRules_SpringFestival">春節</string>
+    <string name="MyAttendanceRules_QingmingFestival">清明節</string>
+    <string name="MyAttendanceRules_LaborDay">勞動節</string>
+    <string name="MyAttendanceRules_TheDragonBoatFestival">端午節</string>
+    <string name="MyAttendanceRules_nationalDay">國慶節</string>
+    <string name="MyAttendanceRules_MidAutumnFestival">中秋節</string>
+    <string name="SchedulingSetting_DeleteTitle">是否刪除該班次</string>
+    <string name="SchedulingSetting_ConflictDepartment">有衝突部門1個，查看設置</string>
+    <string name="SchedulingSetting_ConflictPerson1">有衝突人員</string>
+    <string name="SchedulingSetting_ConflictPerson2">個，查看設置</string>
+    <string name="WorkingTime1">上班時間1</string>
+    <string name="WorkingTime2">上班時間2</string>
+    <string name="WorkingTime3">上班時間3</string>
+    <string name="SchedulingTime_SelectReminder">選擇時間超出時間</string>
+    <string name="SchedulingTime_SelectBestWorking1">提前1小時</string>
+    <string name="SchedulingTime_SelectBestWorking2">提前2小時</string>
+    <string name="SchedulingTime_SelectBestWorking3">提前3小時</string>
+    <string name="SchedulingTime_SelectBestWorking4">提前4小時</string>
+    <string name="SchedulingTime_SelectBestWorking5">提前5小時</string>
+    <string name="SchedulingTime_SelectBestWorking6">提前6小時</string>
+    <string name="SchedulingTime_SelectBestWorking7">提前7小時</string>
+    <string name="ParticipatingPerson_selectedPerson2">個人員</string>
+    <string name="rule_name">規則名稱</string>
+    <string name="Set_Scheduling">排班</string>
+    <string name="Scheduling_type">排班類型</string>
+    <string name="Normal_frequency">正常班次</string>
+   <string name="no_flights">無班次，聯繫管理員</string>
+   <string name="Monday">週一</string>
+   <string name="Tuesday">週二</string>
+   <string name="Wednesday">週三</string>
+   <string name="Thursday">週四</string>
+   <string name="Friday">週五</string><string name="Saturday">週六</string>
+   <string name="Sunday">週日</string>
+   <string name="holiday_date1">12月31日~1月2日 共3天</string>
+   <string name="holiday_date2">1月27日~2月2日 共7天 調休;2月4日上班</string>
+   <string name="holiday_date3">4月2日~4月4日 共3天 調休;4月1日上班</string>
+   <string name="holiday_date4">4月29日~5月1日 共3天</string>
+   <string name="holiday_date5">5月28日~5月30日 共3天 調休;5月27日上班</string>
+   <string name="holiday_date6">10月1日~10月8日 共8天 調休;9月30日上班</string>
+    <string name="remove_blacklist">移出黑名單</string>
 </resources>

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

@@ -436,7 +436,6 @@
 
 
     <string name="add_tag">Add Tag</string>
-    <string name="title_activity_sales_ranking">荣誉墙</string>
 
     <string name="pull_to_refresh_pull_label" translatable="false">向下拉动可以刷新</string>
     <string name="pull_to_refresh_release_label" translatable="false">松开可以刷新</string>
@@ -1597,6 +1596,58 @@
     <string name="mobile_change_name">变更理由</string>
     <string name="input_reason">请填写理由</string>
     <string name="personnel">人员</string>
+    <string name="CRM_grabBusinessFaild">抢占商机失败</string>
+    <string name="CRM_sorryYouHaveOverTheBiggestBusinessQuantity">对不起,您已超过最大拥有的商机数量!</string>
+    <string name="CRM_addDate_sorryThisBusinessHaveAdd">对不起，此商机已添加过日程！</string>
+    <string name="CRM_businessLose_leaderGetFaild">获取直属领导数据失败</string>
+    <string name="CRM_businessLose_treatmentTime">处理时间</string>
+    <string name="CRM_businessLose_leader">直属领导</string>
+    <string name="CRM_sorryOnlyPickOneClient">对不起，只能选择一个客户</string>
+    <string name="CRM_pleasePickClientFirst">请先选择客户</string>
+    <string name="CRM_current_page_change_ecet">当前页数据已更改，请先更新，然后提交</string>
+    <string name="CRM_unable_ecet">无法访问服务器，请稍后再试</string>
+    <string name="MyAttendanceRules_legalHoliday">遵循法定节假日</string>
+    <string name="MyAttendanceRules_newYearsDay">元旦</string>
+    <string name="MyAttendanceRules_SpringFestival">春节</string>
+    <string name="MyAttendanceRules_QingmingFestival">清明节</string>
+    <string name="MyAttendanceRules_LaborDay">劳动节</string>
+    <string name="MyAttendanceRules_TheDragonBoatFestival">端午节</string>
+    <string name="MyAttendanceRules_nationalDay">国庆节</string>
+    <string name="MyAttendanceRules_MidAutumnFestival">中秋节</string>
+    <string name="SchedulingSetting_DeleteTitle">是否删除该班次</string>
+    <string name="SchedulingSetting_ConflictDepartment">有冲突部门1个，查看设置</string>
+    <string name="SchedulingSetting_ConflictPerson1">有冲突人员</string>
+    <string name="SchedulingSetting_ConflictPerson2">个，查看设置</string>
+    <string name="WorkingTime1">上班时间1</string>
+    <string name="WorkingTime2">上班时间2</string>
+    <string name="WorkingTime3">上班时间3</string>
+    <string name="SchedulingTime_SelectReminder">选择时间超出时间</string>
+    <string name="SchedulingTime_SelectBestWorking1">提前1小时</string>
+    <string name="SchedulingTime_SelectBestWorking2">提前2小时</string>
+    <string name="SchedulingTime_SelectBestWorking3">提前3小时</string>
+    <string name="SchedulingTime_SelectBestWorking4">提前4小时</string>
+    <string name="SchedulingTime_SelectBestWorking5">提前5小时</string>
+    <string name="SchedulingTime_SelectBestWorking6">提前6小时</string>
+    <string name="SchedulingTime_SelectBestWorking7">提前7小时</string>
+    <string name="ParticipatingPerson_selectedPerson2">个人员</string>
+    <string name="rule_name">规则名称</string>
+    <string name="Set_Scheduling">排班</string>
+    <string name="Scheduling_type">排班类型</string>
+    <string name="Normal_frequency">正常班次</string>
+    <string name="no_flights">无班次，联系管理员</string>
+    <string name="Monday">周一</string>
+    <string name="Tuesday">周二</string>
+    <string name="Wednesday">周三</string>
+    <string name="Thursday">周四</string>
+    <string name="Friday">周五</string>
+    <string name="Saturday">周六</string>
+    <string name="Sunday">周日</string>
+    <string name="holiday_date1">12月31日~1月2日  共3天</string>
+    <string name="holiday_date2">1月27日~2月2日 共7天 调休;2月4日上班</string>
+    <string name="holiday_date3">4月2日~4月4日 共3天  调休;4月1日上班</string>
+    <string name="holiday_date4">4月29日~5月1日   共3天</string>
+    <string name="holiday_date5">5月28日~5月30日  共3天  调休;5月27日上班</string>
+    <string name="holiday_date6">10月1日~10月8日  共8天  调休;9月30日上班</string>
     <string name="not_message_and_add">没有找到数据，请点击右上角的+进行添加</string>
 
 </resources>