提交代码保存

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

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

@@ -172,8 +172,8 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void showExitDialog() {
-        new AlertDialog.Builder(mContext).setTitle(R.string.meet_manage).setMessage(R.string.to_end_meet).setNegativeButton(R.string.cancel, null)
-                .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+        new AlertDialog.Builder(mContext).setTitle(R.string.meet_manage).setMessage(R.string.to_end_meet).setNegativeButton(R.string.common_cancel, null)
+                .setPositiveButton(R.string.common_sure, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         doNetSubmit(ENDMEET);
@@ -192,10 +192,10 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         findViewById(R.id.add_task_ll).setOnClickListener(this);
         if (entity == null) return;
         //设置会议 地点、介绍、发起人、标签
-        addr_tv.setText(entity.getMa_mrname() == null ? "未填写" : entity.getMa_mrname());
+        addr_tv.setText(entity.getMa_mrname() == null ? getString(R.string.common_noinput) : entity.getMa_mrname());
         sub_tv.setText(entity.getMa_remark() == null ? "" : entity.getMa_remark());
         user_tv.setText(entity.getMa_recorder() == null ? "" : entity.getMa_recorder());
-        tag_tv.setText(StringUtils.isEmpty(entity.getMa_tag()) ? "未填写" : entity.getMa_tag());
+        tag_tv.setText(StringUtils.isEmpty(entity.getMa_tag()) ? getString(R.string.common_noinput) : entity.getMa_tag());
         //设置会议状态
         String str = entity.getMa_stage();
         if (StringUtils.isEmpty(str)) {

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

@@ -335,7 +335,7 @@ public class MeetingActivity extends BaseActivity implements RecognizerDialogLis
             viewholder.oa_meeting_name_tv.setText(entity.getMa_theme());
             viewholder.oa_meeting_addr_tv.setText(entity.getMa_mrname());
             viewholder.oa_meeting_user_tv.setText(entity.getMa_recorder());
-            viewholder.oa_meeting_tag_tv.setText(StringUtils.isEmpty(entity.getMa_type()) ? "未填写" : entity.getMa_type());
+            viewholder.oa_meeting_tag_tv.setText(StringUtils.isEmpty(entity.getMa_type()) ? getString(R.string.common_noinput) : entity.getMa_type());
             if (entity.getMa_tag() == null || entity.getMa_tag().length() <= 0) return;
         }
 

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

@@ -25,7 +25,7 @@ import java.util.Map;
 public class OARegisterActivity extends BaseActivity {
     private TabLayout tabLayout;
     private ViewPager viewPager;
-    private String[] title = {"已签到", "未签到"};
+    private String[] title = {getString(R.string.signined), getString(R.string.unsignined)};
     private int ma_id;
     private String ma_code;
     private String baseUrl;

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

@@ -59,7 +59,7 @@ public class SaveMeetActivity extends BaseActivity {
                     if (json.containsKey("success") && json.getBoolean("success")) {
                         updataCode();//保存成功后更新编号
                     } else {
-                        ToastUtil.showToast(SaveMeetActivity.this, "保存会议纪要失败");
+                        ToastUtil.showToast(SaveMeetActivity.this, R.string.make_adeal_failed);
                     }
                     break;
                 case 0x12://保存后更新编号后提交审批流
@@ -81,7 +81,6 @@ public class SaveMeetActivity extends BaseActivity {
 //                            submitMeeting(id);
                         }
                     } catch (Exception e) {
-                        ToastMessage("解析数据错误");
                     }
                     break;
                 case 0x14:
@@ -98,7 +97,6 @@ public class SaveMeetActivity extends BaseActivity {
                         });
 
                     } else {
-                        Crouton.makeText(ct, "获取id错误");
                     }
                     break;
                 case 0x17://提交审批流
@@ -205,7 +203,7 @@ public class SaveMeetActivity extends BaseActivity {
         Intent intent = new Intent(ct, SelectActivity.class);
         intent.putExtra("type", 2);
         intent.putParcelableArrayListExtra("data", beans);
-        intent.putExtra("title", "选择审批人");
+        intent.putExtra("title", getString(R.string.select_approvel_people));
         startActivityForResult(intent, 0x22);
     }
 
@@ -214,25 +212,25 @@ public class SaveMeetActivity extends BaseActivity {
         String chche = "";
         chche = summary_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
-            ToastUtil.showToast(ct, "会议纪要未按要求填写");
+            ToastUtil.showToast(ct, R.string.input_meeting_note);
             return;
         }
         builder.append("会议纪要:" + chche + "             ");
         chche = resolution_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
-            ToastUtil.showToast(ct, "会议决议未按要求填写");
+            ToastUtil.showToast(ct, R.string.input_meeting_resolution);
             return;
         }
         builder.append("会议决议:" + chche + "             ");
         chche = wreckage_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
-            ToastUtil.showToast(ct, "遗留问题未按要求填写");
+            ToastUtil.showToast(ct, R.string.input_meeting_left);
             return;
         }
         builder.append("遗留问题:" + chche + "             ");
         chche = follow_et.getText().toString();
         if (StringUtils.isEmpty(chche)) {
-            ToastUtil.showToast(ct, "后续工作未按要求填写");
+            ToastUtil.showToast(ct, R.string.input_meeting_next);
             return;
         }
         doSave(code, builder.toString(), id);

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

@@ -237,7 +237,7 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
         if (notLocationDialog == null)
             notLocationDialog = new MaterialDialog.Builder(ct).title(R.string.prompt_title).
                     content(R.string.allow_location)
-                    .positiveText(R.string.sure).
+                    .positiveText(R.string.common_sure).
                             autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
                         @Override
                         public void onPositive(MaterialDialog dialog) {

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

@@ -90,8 +90,8 @@ public class SelectAimAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
     private void bindLoadView(LoadViewHolder holder, SelectAimModel model) throws Exception {
         holder.title_tv.setText(getNull(model.getName()));
         holder.sub_tv.setText(getNull(model.getAddress()));
-        holder.time_tv.setText("上次拜访 " + getNull(model.getTime()));
-        holder.times_tv.setText("总拜访 " + getNull(model.getTimes() + " 次"));
+        holder.time_tv.setText(MyApplication.getInstance().getString(R.string.last_visit)+" " + getNull(model.getTime()));
+        holder.times_tv.setText(MyApplication.getInstance().getString(R.string.visit_num)+" "  + getNull(model.getTimes() + MyApplication.getInstance().getString(R.string.sign_Times)));
         holder.distance_tv.setText(getKm(BaiduMapUtil.getInstence().getDistance(model.getLatLng())));
         holder.tag_tv.setVisibility(model.isFirst() ? View.VISIBLE : View.GONE);
         holder.tag_view.setVisibility(model.isFirst() ? View.VISIBLE : View.GONE);

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

@@ -16,7 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="10dp"
         android:layout_toRightOf="@id/home_tag"
-        android:text="没有符合条件的结果"
+        android:text="@string/not_search_message"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
@@ -26,7 +26,7 @@
         android:layout_alignLeft="@id/title"
         android:layout_below="@id/title"
         android:layout_toRightOf="@id/home_tag"
-        android:text="请搜索地址后完善单位名称"
+        android:text="@string/search_address_input_company"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />
 </RelativeLayout>

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

@@ -8,7 +8,7 @@
         android:id="@+id/tag_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="企业"
+        android:text="@string/enterprise"
         android:visibility="gone"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine" />

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

@@ -8,7 +8,7 @@
         android:id="@+id/tag_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="地图"
+        android:text="@string/map"
         android:textColor="@color/text_hine"
         android:textSize="@dimen/text_hine"
         android:visibility="gone" />

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

@@ -1239,4 +1239,18 @@
     <string name = "add_blacklist_succ"> add blacklist success </string>
 
     <string name="not_message_and_add">没有找到数据，请点击右上角的+进行添加</string>
+    <string name="change_mobile">打卡设备变更单</string>
+    <string name="supple_signin">申诉申请</string>
+    <string name="last_visit">上次拜访</string>
+    <string name="visit_num">总拜访</string>
+    <string name="search_address_input_company">请搜索地址后完善单位名称</string>
+    <string name="enterprise">企业</string>
+    <string name="map">地图</string>
+    <string name="other_map">使用其他地图</string>
+    <string name="click_finds"><u>点击查看</u></string>
+    <string name="unsignined">未签到</string>
+    <string name="input_meeting_note">会议纪要未按要求填写</string>
+    <string name="input_meeting_resolution">会议决议未按要求填写</string>
+    <string name="input_meeting_left">遗留问题未按要求填写</string>
+    <string name="input_meeting_next">后续工作未按要求填写</string>
 </resources>

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

@@ -669,7 +669,20 @@
     <string name="change_signin_ok">申诉成功!</string>
     <string name="personnel">人员</string>
     <string name="not_message_and_add">没有找到数据，请点击右上角的+进行添加</string>
-
+    <string name="change_mobile">打卡设备变更单</string>
+    <string name="supple_signin">申诉申请</string>
+    <string name="last_visit">上次拜访</string>
+    <string name="visit_num">总拜访</string>
+    <string name="search_address_input_company">请搜索地址后完善单位名称</string>
+    <string name="enterprise">企业</string>
+    <string name="map">地图</string>
+    <string name="other_map">使用其他地图</string>
+    <string name="click_finds"><u>点击查看</u></string>
+    <string name="unsignined">未签到</string>
+    <string name="input_meeting_note">会议纪要未按要求填写</string>
+    <string name="input_meeting_resolution">会议决议未按要求填写</string>
+    <string name="input_meeting_left">遗留问题未按要求填写</string>
+    <string name="input_meeting_next">后续工作未按要求填写</string>
 
     <!--end by Bitliker-->
 

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

@@ -640,9 +640,20 @@
     <string name="change_signin_ok">申訴成功！</string>
     <string name="personnel">人員</string>
     <string name="not_message_and_add">沒有找到數據，請點擊右上角的+進行添加</string>
-
-    <string name="change_mobile">打卡设备变更单</string>
-    <string name="supple_signin">申诉申请</string>
+    <string name="change_mobile">打卡設備變更單</string>
+    <string name="supple_signin">申訴申請</string>
+    <string name="last_visit">上次拜訪</string>
+    <string name="visit_num">總拜訪</string>
+    <string name="search_address_input_company">請蒐索地址後完善單位名稱</string>
+    <string name="enterprise">企業</string>
+    <string name="map">地圖</string>
+    <string name="other_map">使用其他地圖</string>
+    <string name="click_finds"><u>點擊查看</u></string>
+    <string name="unsignined">未簽到</string>
+    <string name="input_meeting_note">會議紀要未按要求填寫</string>
+    <string name="input_meeting_resolution">會議決議未按要求填寫</string>
+    <string name="input_meeting_left">遺留問題未按要求填寫</string>
+    <string name="input_meeting_next">後續工作未按要求填寫</string>
     <!--end by Bitliker-->
 
     <!--start by Arison-->

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

@@ -1649,7 +1649,16 @@
     <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>
-
     <string name="unsubmit">反提交</string>
     <string name="Operation_succeeded">反提交成功</string>
+    <string name="last_visit">上次拜访</string>
+    <string name="visit_num">总拜访</string>
+    <string name="search_address_input_company">请搜索地址后完善单位名称</string>
+    <string name="enterprise">企业</string>
+    <string name="map">地图</string>
+    <string name="unsignined">未签到</string>
+    <string name="input_meeting_note">会议纪要未按要求填写</string>
+    <string name="input_meeting_resolution">会议决议未按要求填写</string>
+    <string name="input_meeting_left">遗留问题未按要求填写</string>
+    <string name="input_meeting_next">后续工作未按要求填写</string>
 </resources>