捡漏

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

@@ -113,7 +113,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
     private void initView() {
         isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("拜访报告");
+        getSupportActionBar().setTitle(getString(R.string.visitrecord));
         findViewById(R.id.voice_search_iv).setOnClickListener(this);
         if (isB2b) {
             findViewById(R.id.stage_rl).setVisibility(View.GONE);
@@ -238,7 +238,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         if (getIntent().getBooleanExtra("isMe", true)) {
             getMenuInflater().inflate(R.menu.main_btn_submit, menu);
             if (!getIntent().getBooleanExtra("isAgen", false)) {
-                menu.getItem(0).setTitle("保存");
+                menu.getItem(0).setTitle(getString(R.string.common_save_button));
             }
         }
         return true;
@@ -276,7 +276,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
-                    ToastMessage("保存成功!");
+                    ToastMessage(getString(R.string.common_save_success));
                     if (!isB2b && vp_id != -1)//更新接口
                         updataCode();
                     else if (!isB2b && !getIntent().getBooleanExtra("isAgen", false) && !isB2b) {//第一次
@@ -291,7 +291,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 //                    }, 3000);
                     break;
                 case 0x16://更新状态接口
-                    ToastMessage("更新成功！");
+                    ToastMessage(getString(R.string.update_success));
                     if (!getIntent().getBooleanExtra("isAgen", false)) {//第一次
                         submit();
                     } else
@@ -383,11 +383,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         String end = tv_date_end.getText().toString().trim();
         String time = TimeUtils.f_long_2_str(System.currentTimeMillis());
         if (!StringUtils.isEmpty(start) && time.compareTo(start) < 0) {
-            Crouton.makeText(ct, "开始时间不能大于当前系统时间");
+            Crouton.makeText(ct, getString(R.string.startT_cannott_big_sT));
             return false;
         }
         if (!StringUtils.isEmpty(end) && time.compareTo(end) < 0) {
-            Crouton.makeText(ct, "截止时间不能大于当前系统时间");
+            Crouton.makeText(ct, getString(R.string.endT_cannott_big_sT));
             return false;
         }
         if (!StringUtils.isEmpty(end) && !StringUtils.isEmpty(start) && start.compareTo(end) >= 0) {
@@ -395,11 +395,11 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             return false;
         }
         if (TextUtils.isEmpty(tv_visit_content.getText())) {
-            Crouton.makeText(ct, "请输入拜访内容");
+            Crouton.makeText(ct, getString(R.string.input_vist_context));
             return false;
         }
         if (!validatorInput()) {
-            ToastMessage("不能输入特殊字符");
+            ToastMessage(getString(R.string.limit_unno_zijie));
         }
         return tv_customer_login.testValidity()
                 && tv_linksman_login.testValidity()
@@ -567,7 +567,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 intent.putExtra("key", "businesschance");
                 intent.putExtra("showKey", "name");
                 intent.putExtra("action", "mobile/crm/getnichecodes.action");
-                intent.putExtra("title", "关联商机");
+                intent.putExtra("title", getString(R.string.connect_businedd));
                 startActivityForResult(intent, 0x24);
                 break;
             case R.id.tv_visit_type:
@@ -578,17 +578,17 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
 
                 //华东地区，华南地区，华北地区，华中地区，西南地区，西北地区，东北地区，港澳台地区，海外地区，其它地区
                 SelectBean ben = new SelectBean();
-                ben.setName("客户拜访");
+                ben.setName(getString(R.string.crmmain_customer_visit));
                 ben.setObject("OfficeClerk");
                 ben.setJson("OfficeClerk");
                 beanList.add(ben);
 
                 ben = new SelectBean();
-                ben.setName("原厂拜访");
+                ben.setName(getString(R.string.Original_visit));
                 ben.setObject("VisitRecord!Vender");
                 ben.setJson("VisitRecord!Vender");
                 beanList.add(ben);
-                intent.putExtra("title", "拜访类型");
+                intent.putExtra("title", getString(R.string.visitting_type));
                 intent.putParcelableArrayListExtra("data", (ArrayList<? extends Parcelable>) beanList);
                 startActivityForResult(intent, 0x27);
                 break;
@@ -701,7 +701,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
             }
         } else if (requestCode == 0x29) {
             String message = data.getStringExtra("data");
-            tv_visit_theme.setText(StringUtils.isEmpty(message) ? "客情维护" : message);
+            tv_visit_theme.setText(StringUtils.isEmpty(message) ? getString(R.string.maintain_customers) : message);
         }
     }
 
@@ -717,9 +717,9 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
         final EditText company_et = (EditText) contentView.findViewById(R.id.company_et);
         TextView address_tv = (TextView) contentView.findViewById(R.id.address_tv);
         title_tv = (TextView) contentView.findViewById(R.id.title_tv);
-        title_tv.setText("完善客户地址名称");
+        title_tv.setText(getString(R.string.ws_client_address_name));
         company_et.setText(model.getName());
-        address_tv.setText("客户地址: " + model.getAddress());
+        address_tv.setText(getString(R.string.client_customer_address) + model.getAddress());
         Editable etext = company_et.getText();
         Selection.setSelection(etext, etext.length());
         DisplayMetrics dm = getResources().getDisplayMetrics();

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

@@ -415,7 +415,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         if (content_tv != null)
             content_tv.setText(StringUtils.isEmpty(subTitle) ? "" : subTitle);
         if (time_tv != null)
-            time_tv.setText(num == 0 ? "" : (StringUtils.isEmpty(time)) ? "刚刚" : time);
+            time_tv.setText(num == 0 ? "" : (StringUtils.isEmpty(time)) ? getString(R.string.friendly_time_just_now) : time);
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -72,7 +72,7 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         ViewUtils.inject(this);
         ct = this;
         TAG = "TaskAddErpActivity";
-        getSupportActionBar().setTitle("新增任务");
+        getSupportActionBar().setTitle(getString(R.string.task_add));
         String people = getIntent().getStringExtra("people") == null ? "" : getIntent().getStringExtra("people");
         if (!StringUtils.isEmpty(people)) {
             et_task_people.setTags(people);

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

@@ -25,7 +25,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="开始时间"
+                android:text="@string/task_starttime"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -43,7 +43,7 @@
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
-                android:hint="请选择"
+                android:hint="@string/common_select1"
                 editTextFormExample:testType="nocheck" />
 
         </RelativeLayout>
@@ -61,7 +61,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="截止时间"
+                android:text="@string/task_endtime"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -79,7 +79,7 @@
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
-                android:hint="请选择"
+                android:hint="@string/common_select1"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -97,7 +97,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="客户名称"
+                android:text="@string/client_Customer_name"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -114,7 +114,7 @@
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
-                android:hint="请选择（必选）"
+                android:hint="@string/common_select"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -132,7 +132,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="联系人"
+                android:text="@string/common_Contact_person"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -146,7 +146,7 @@
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_linksman_login"
                 style="@style/form_relative_right_text"
-                android:hint="请输入（必填）"
+                android:hint="@string/common_input"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -166,7 +166,7 @@
                 android:drawablePadding="10dp"
                 android:editable="true"
                 android:gravity="center"
-                android:text="客户地址"
+                android:text="@string/client_customer_address"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -180,7 +180,7 @@
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_address_login"
                 style="@style/form_relative_right_text"
-                android:hint="请输入（必填）"
+                android:hint="@string/common_input"
                 android:maxHeight="70dp"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
@@ -198,7 +198,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="拜访目的"
+                android:text="@string/visit_aim"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -217,7 +217,7 @@
                 android:ellipsize="end"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
-                android:hint="请选择（必选）"
+                android:hint="@string/common_select"
                 android:lines="1"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
@@ -234,7 +234,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="拜访类型"
+                android:text="@string/visitting_type"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -255,7 +255,7 @@
                 android:layout_toEndOf="@+id/textView1"
                 android:layout_toRightOf="@+id/textView1"
                 android:drawableRight="@drawable/nav_icon_search_default"
-                android:hint="请选择"
+                android:hint="@string/common_select1"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -272,7 +272,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="当前阶段"
+                android:text="@string/current_stage"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -309,7 +309,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="关联商机"
+                android:text="@string/connect_businedd"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -327,7 +327,7 @@
                 android:drawableRight="@drawable/nav_icon_search_default"
                 android:focusable="false"
                 android:focusableInTouchMode="false"
-                android:hint="请选择"
+                android:hint="@string/common_select1"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>
 
@@ -343,7 +343,7 @@
                 android:layout_marginLeft="20dp"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="拜访内容"
+                android:text="@string/visit_content"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
@@ -361,7 +361,7 @@
             <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/tv_visit_content"
                 style="@style/form_relative_right_text"
-                android:hint="请输入（必填）"
+                android:hint="@string/common_input"
                 android:maxHeight="1000sp"
                 editTextFormExample:testType="nocheck" />
         </RelativeLayout>

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

@@ -23,7 +23,7 @@
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
-            android:hint="@string/search"
+            android:hint="@string/common_search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />

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

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/search"
         android:icon="@drawable/more"
-        android:title="添加"
+        android:title="@string/new_add"
         app:showAsAction="ifRoom"/>
 
 </menu>

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,4 +1,4 @@
 
 #发布版本状态改为true,测试版本状态为false
 #release_version = true
-release_version = true
+release_version = false

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

@@ -615,6 +615,7 @@
         <string name = "set_sport"> UURun </string>
         <string name = "set_push"> Allows Push </string>
         <string name = "set_clear"> Clear Cache </string>
+        <string name="set_sigin">Punch Card Settings</string>
         <string name = "set_suggest"> Customer Feedback </string>
         <string name = "set_about"> About UU Interconnection </string>
         <string name = "set_version"> Current Version </string>
@@ -1052,4 +1053,21 @@
     <string name="step_Thursday">THU</string>
     <string name="step_Friday">FRI</string>
     <string name="step_Saturday">SAT</string>
+    <string name="set_language">Switch Language</string>
+    <string name="search">Search</string>
+    <string name="msg_offline">Message (offline)</string>
+    <string name="msg_connect">Message (in connection)</string>
+    <string name="title_friend_add">Add Friend</string>
+    <string name="all_date">all date</string>
+    <string name="visitrecord">Visit the report</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="visit_content">Visit the 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>
+    <string name="input_vist_context"> Please enter the content </string>
+    <string name="limit_unno_zijie"> Can not enter special characters</string>
+    <string name="Original_visit">Original visit</string>
+    <string name="ws_client_address_name">Edit customer address name</string>
 </resources>

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

@@ -1183,4 +1183,14 @@
     <string name="step_Thursday">四</string>
     <string name="step_Friday">五</string>
     <string name="step_Saturday">六</string>
+    <string name="all_date">所有日期</string>
+    <string name="update_success">更新成功</string>
+    <string name="visitting_type">拜访类型</string>
+    <string name="connect_businedd">关联商机</string>
+    <string name="startT_cannott_big_sT">开始时间不能大于当前系统时间</string>
+    <string name="endT_cannott_big_sT">截止时间不能大于当前系统时间</string>
+    <string name="input_vist_context">请输入拜访内容</string>
+    <string name="limit_unno_zijie">不能输入特殊字符</string>
+    <string name="Original_visit">原厂拜访</string>
+    <string name="ws_client_address_name">完善客户地址名称</string>
 </resources>

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

@@ -695,7 +695,7 @@
     <string name="set_sport">UU運動</string>
     <string name="set_push">允許推送</string>
     <string name="set_clear">清除緩存</string>
-    <string name="set_sigin">打卡設定</string>
+    <string name="set_sigin">打卡設置</string>
     <string name="set_suggest">用戶回饋</string>
     <string name="set_about">關於UU互聯</string>
     <string name="set_version">當前版本</string>
@@ -1172,4 +1172,14 @@
     <string name="step_Thursday">四</string>
     <string name="step_Friday">五</string>
     <string name="step_Saturday">六</string>
+    <string name="all_date">所有日期</string>
+    <string name="update_success">更新成功</string>
+    <string name="visitting_type">拜訪類型</string>
+    <string name="connect_businedd">關聯商機</string>
+    <string name="startT_cannott_big_sT">開始時間不能大於當前系統時間</string>
+    <string name="endT_cannott_big_sT">截止時間不能大於當前系統時間</string>
+    <string name="input_vist_context">請輸入拜訪內容</string>
+    <string name="limit_unno_zijie">不能輸入特殊字符</string>
+    <string name="Original_visit">原廠拜訪</string>
+    <string name="ws_client_address_name">完善客戶地址名稱</string>
 </resources>

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

@@ -1227,6 +1227,7 @@
     <string name="set_sport">UU运动</string>
     <string name="set_push">允许推送</string>
     <string name="set_clear">清除缓存</string>
+    <string name="set_sigin">打卡设置</string>
     <string name="set_suggest">用户反馈</string>
     <string name="set_about">关于UU互联</string>
     <string name="set_version">当前版本</string>
@@ -1551,4 +1552,5 @@
     <string name="select_client">选择客户</string>
     <string name="work_business_find">商品查询</string>
     <string name="app_trytoget_outplan">获取外勤计划失败</string>
+    <string name="set_language">切换语言</string>
 </resources>