计步数据库独立出来了吧

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"

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

@@ -187,7 +187,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>
@@ -233,7 +233,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>
@@ -283,9 +283,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>
@@ -305,10 +305,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"> successfully grab this Niche </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"> go to the Niche table to follow up the Niche </string>
     <!-- start 商机来源-->
     <string name = "Come_to_visit"> come to visit </string>
          <string name = "tel_to_visit"> phone call </string>
@@ -324,7 +324,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>
@@ -498,7 +498,7 @@
         <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 = "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>
@@ -966,7 +966,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>
@@ -1032,7 +1032,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>
@@ -1068,7 +1068,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>
@@ -1127,8 +1127,25 @@
     <string name="address">address</string>
     <string name="assign">assign</string>
     <string name="transfer">transfer</string>
-    <string name="contect_is_much">联系人为必填项</string>
-    <string name="context_is_much">拜访内容为必填项</string>
-    <string name="times">时段</string>
-    <string name="create_addree">创建地点</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">phase follow</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  failure</item>
+        <item> to new customer</item>
+        <item> associated with existing customer</item>
+    </string-array>
+    <string name="common_input_or_select_much">Please enter or select (required)</string>
+    <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>
 </resources>

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

@@ -1245,4 +1245,6 @@
     <string name="address">地址</string>
     <string name="assign">分配</string>
     <string name="transfer">转移</string>
+    <string name="work_sign">上班打卡</string>
+    <string name="off_sign">下班打卡</string>
 </resources>

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

@@ -1233,4 +1233,7 @@
     <string name="address">地址</string>
     <string name="assign">分配</string>
     <string name="transfer">轉移</string>
+    <string name="common_input_or_select_much">請輸入或選擇(必選)</string>
+    <string name="work_sign">上班打卡</string>
+    <string name="off_sign">下班打卡</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>