商机部分捡漏

WeiChat/src/main/AndroidManifest.xml

@@ -901,9 +901,7 @@
             android:exported="true" />
         <!-- 计步功能 服务 -->
         <service
-            android:name="com.xzjmyk.pm.newpedo.service.StepService"
-            android:priority="1000"
-            android:process="com.spring.stepcount.service">
+            android:name="com.xzjmyk.pm.newpedo.service.StepService">
             <intent-filter>
 
                 <!-- 系统启动完成后会调用 -->

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

@@ -218,7 +218,7 @@ public class BusinessDetailInfoActivity extends BaseActivity implements View.OnC
 
     private void initView() {
         ViewUtils.inject(this);
-        getSupportActionBar().setTitle("商机详情");
+        getSupportActionBar().setTitle(getString(R.string.business_detail));
         Intent intent = getIntent();
         if (intent != null) {
             type = intent.getIntExtra("type", 0);

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

@@ -71,6 +71,7 @@ public class TeamsAttShowActivity extends BaseActivity {
                         if (!StringUtils.isEmpty(msg.getData().getString("result"))) {
                             ToastMessage(msg.getData().getString("result"));
                         }
+                        progressDialog.dismiss();
                     }
                     break;
             }
@@ -111,6 +112,7 @@ public class TeamsAttShowActivity extends BaseActivity {
                 myadapter.setTeams_section(teams_section);
                 myadapter.notifyDataSetChanged();
                 LogUtil.prinlnLongMsg("teams_section",teams_section + "");
+                progressDialog.dismiss();
             } else {
                 ToastMessage("resultJsonObject == null");
             }
@@ -131,6 +133,7 @@ public class TeamsAttShowActivity extends BaseActivity {
     }
 
     private void initView() {
+        progressDialog.show();
         plv = (ListView) findViewById(R.id.teams_att_show_plv);
         teams_section = new ArrayList<>();
         myadapter = new TeamsAttShowAdapter();

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

@@ -249,7 +249,7 @@ public class AttendancesFragment extends EasyFragment implements View.OnClickLis
             viewHolder.attendances_late_tv.setText("" + mAttenddancesBean.getDatas().get(position).getLatecount() + getString(R.string.sign_Times));
             viewHolder.attendances_leaveearly_tv.setText("" + mAttenddancesBean.getDatas().get(position).getEarlycount() + getString(R.string.sign_Times));
             viewHolder.attendances_absenteeism_tv.setText("" + mAttenddancesBean.getDatas().get(position).getNoncount() + getString(R.string.sign_Times));
-            viewHolder.attendances_workhours_tv.setText("" + mAttenddancesBean.getDatas().get(position).getAtime() + getString(R.string.sign_hour_day));
+//            viewHolder.attendances_workhours_tv.setText("" + mAttenddancesBean.getDatas().get(position).getAtime() + getString(R.string.sign_hour_day));
 
             if (CommonUtil.getNumByString(mAttenddancesBean.getDatas().get(position).getAtime()) < 8) {
                 viewHolder.attendances_trend_iv.setImageResource(R.drawable.down);

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

@@ -118,7 +118,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:text="基本信息"
+                        android:text="@string/common_basicinfo"
                         android:textColor="#FF8E57"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -131,7 +131,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="商机编号"
+                        android:text="@string/business_id"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -148,7 +148,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="商机名称"
+                        android:text="@string/business_name"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -165,7 +165,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="来源"
+                        android:text="@string/business_from"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -182,7 +182,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="商机库"
+                        android:text="@string/business_Library"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -217,7 +217,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="当前阶段"
+                        android:text="@string/current_stage"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -234,7 +234,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="创建时间"
+                        android:text="@string/creat_time"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -251,7 +251,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="创建人"
+                        android:text="@string/creater"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -269,7 +269,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="最后跟进时间"
+                        android:text="@string/last_followup_time"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -286,7 +286,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="跟进人"
+                        android:text="@string/Follow_up_person"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -303,7 +303,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="企业名称"
+                        android:text="@string/Company_Name"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -320,7 +320,7 @@
                         style="@style/TextView_VerticalCenter"
                         android:layout_width="90dp"
                         android:layout_marginLeft="10dp"
-                        android:text="地址"
+                        android:text="@string/address"
                         android:textColor="@color/gray_light" />
 
                     <TextView
@@ -345,7 +345,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:text="商机阶段"
+                        android:text="@string/business_stage"
                         android:textColor="#FF8E57"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -360,7 +360,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:padding="10dp"
-                    android:text="阶段要求"
+                    android:text="@string/Stage_requirements"
                     android:textColor="@color/black" />
 
                 <com.xzjmyk.pm.activity.view.stickylistheaders.StickyListHeadersListView
@@ -383,7 +383,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:text="联系方式"
+                        android:text="@string/common_Contact_information"
                         android:textColor="#FF8E57"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -465,7 +465,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_margin="10dp"
-                        android:text="其它"
+                        android:text="@string/others"
                         android:textColor="#FF8E57"
                         android:textSize="15sp" />
                 </LinearLayout>
@@ -541,7 +541,7 @@
                 android:id="@+id/bt_qiang"
                 style="@style/crm_business_btn_nomargin"
                 android:layout_weight="1"
-                android:text="抢"
+                android:text="@string/grab"
                 android:textColor="@color/red" />
 
         </LinearLayout>

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

@@ -39,7 +39,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:text="至"
+                android:text="@string/sign_to"
                 android:layout_marginTop="15dp"
                 android:gravity="center"
                 />
@@ -123,7 +123,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="第一名"
+                android:text="@string/sign_the_first"
                 android:layout_marginTop="10dp"/>
         </LinearLayout>
 
@@ -145,7 +145,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="第二名"
+                    android:text="@string/sign_the_second"
                     android:layout_marginTop="10dp"/>
             </LinearLayout>
 
@@ -166,7 +166,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="第三名"
+                    android:text="@string/sign_the_third"
                     android:layout_marginTop="10dp"/>
             </LinearLayout>
         </LinearLayout>
@@ -206,7 +206,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
-                android:text="@string/sign_actualtime"/>
+                android:text="@string/sign_actualtime"
+                android:visibility="gone"/>
             <ImageView
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

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

@@ -40,7 +40,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="2"
-        android:text="@string/sign_actualtime"/>
+        android:text="@string/sign_actualtime"
+        android:visibility="gone"/>
 
     <ImageView
         android:id="@+id/attendances_trend_iv"

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

@@ -54,7 +54,8 @@
             android:layout_marginTop="5dp"
             android:layout_marginBottom="0dp"
             android:textSize="@dimen/text_hine"
-            android:text="平局工时：8.5小时/天"/>
+            android:text="平局工时：8.5小时/天"
+            android:visibility="gone"/>
     </RelativeLayout>
     <View
         android:layout_width="match_parent"

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

@@ -4,6 +4,6 @@
     tools:context="com.xzjmyk.pm.activity.MainActivity">
     <item
         android:id="@+id/crm_data_find"
-        android:title="筛选"
+        android:title="@string/crm_filter"
         app:showAsAction="ifRoom" />
 </menu>

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

@@ -371,7 +371,7 @@
     <string name = "Wall_of_Fame_description"> if your name is not in the honor wall,please come on,guys!</string>
 
     <string name = "not_addr_to_select"> no address can be selected </string>
-        <string name = "unoffice"> lSelect location</string>
+        <string name = "unoffice"> Select location</string>
         <string name = "rice"> meters </string>
         <string name = "not_addr_message"> The system has not yet found your punch address information, please contact the administrator </string>
         <string name = "not_work_message"> Your flight has not been found. Please contact the administrator to set the frequency. </string>
@@ -524,7 +524,7 @@
         <string name = "uu_auto_signined_up"> The UU helps you sign in automatically for outwork </string>
         <string name = "visit"> visit </string>
         <string name = "auto_mission_signindown"> The UU helps you sign out automatically for outwork </string>
-        <string name = "auto_work_signin_log"> Auto punch card record </string>
+        <string name = "auto_work_signin_log"> Auto sign record </string>
         <string name = "auto_signin"> The system has successfully typed for you </string>
         <string name = "success_signin_down_mission"> Field signout succeeds </string>
         <string name = "success_signin_up_mission"> Auto attendance sign </string>
@@ -1110,12 +1110,21 @@
     <string name="Rated_next">Next time</string>
     <string name="fangkui_success">Submitted success, we will be the first time to view your question, thank you for your cooperation!</string>
     <string name="Uploaded_successfully">Uploaded successfully</string>
-    <string name="create_date">创建日期</string>
-    <string name="select_contact">选择联系人</string>
-    <string name="delete_business_ok">删除商机成功</string>
-    <string name="input_visit_remark">输入拜访目的</string>
-    <string name="input_contact">输入联系人</string>
-    <string name="update_business">修改商机</string>
-    <string name="search_select_hint">搜索项目、品牌、物料、型号等</string>
-    <string name="not_search_message">没有符合条件的结果</string>
+    <string name="create_date">Create date</string>
+    <string name="select_contact">select contact</string>
+    <string name="delete_business_ok">delete business success</string>
+    <string name="input_visit_remark">imput the destination</string>
+    <string name="input_contact">input the contac</string>
+    <string name="update_business">modify niche</string>
+    <string name="search_select_hint">search for items, brands, materials, models, etc. </string>
+    <string name="not_search_message">no matching results</string>
+    <string name="sign_to">to</string>
+    <string name="shorthand_year">Y</string>
+    <string name="sShorthand_month">M</string>
+    <string name="shorthand_day">D</string>
+    <string name="subscribe_title">Subscribe</string>
+    <string name="creater">creator</string>
+    <string name="address">address</string>
+    <string name="assign">assign</string>
+    <string name="transfer">transfer</string>
 </resources>

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

@@ -1232,4 +1232,12 @@
     <string name="Rated_next">以后再说</string>
     <string name="fangkui_success">提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>
+    <string name="sign_to">至</string>
+    <string name="shorthand_year">年</string>
+    <string name="sShorthand_month">月</string>
+    <string name="shorthand_day">日</string>
+    <string name="creater">创建人</string>
+    <string name="address">地址</string>
+    <string name="assign">分配</string>
+    <string name="transfer">转移</string>
 </resources>

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

@@ -1223,4 +1223,12 @@
     <string name="Rated_next">下次再​​說</string>
     <string name="fangkui_success">提交成功,我們會在第一時間查看您的問題,謝謝您的配合！</string>
     <string name="Uploaded_successfully">上傳成功</string>
+    <string name="sign_to">至</string>
+    <string name="shorthand_year">年</string>
+    <string name="sShorthand_month">月</string>
+    <string name="shorthand_day">日</string>
+    <string name="creater">創建人</string>
+    <string name="address">地址</string>
+    <string name="assign">分配</string>
+    <string name="transfer">轉移</string>
 </resources>

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

@@ -1576,4 +1576,11 @@
     <string name="Rated_next">下次再说</string>
     <string name="fangkui_success">"提交成功,我们会在第一时间查看您的问题,谢谢您的配合！</string>
     <string name="Uploaded_successfully">上传成功</string>
+    <string name="sign_to">至</string>
+    <string name="shorthand_year">年</string>
+    <string name="sShorthand_month">月</string>
+    <string name="shorthand_day">日</string>
+    <string name="address">地址</string>
+    <string name="assign">分配</string>
+    <string name="transfer">转移</string>
 </resources>