合并翻译，提交

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>
 
                 <!-- 系统启动完成后会调用 -->
@@ -935,9 +933,7 @@
             android:name=".ui.erp.activity.crm.AddBusinessActivity"
             android:label="@string/crm_creat_business" />
         <activity android:name=".ui.erp.activity.setting.SelectLanguageActivity"></activity>
-        <activity
-            android:name=".ui.erp.activity.oa.SearchSelectActivity"
-            android:label="@string/describe" />
+        <activity android:name=".ui.erp.activity.oa.SearchSelectActivity"></activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/DatabaseManager.java

@@ -11,38 +11,37 @@ import java.util.concurrent.atomic.AtomicInteger;
 public class DatabaseManager {
 
     private AtomicInteger mOpenCounter = new AtomicInteger();
-
     private static DatabaseManager instance;
     private static SQLiteOpenHelper mDatabaseHelper;
     private static SQLiteDatabase mDatabase;
 
     public static synchronized void initializeInstance(SQLiteOpenHelper helper) {
         if (instance == null) {
+            LogUtil.d("initializeInstance DBOpenHelper");
             instance = new DatabaseManager();
             mDatabaseHelper = helper;
         }
     }
-
+   
     public static synchronized DatabaseManager getInstance() {
         if (instance == null) {
-            LogUtil.d("DatabaseManager init");
             initializeInstance(DBOpenHelper.getInstance());
         }
         return instance;
     }
 
     public synchronized SQLiteDatabase openDatabase() {
-        if (mOpenCounter.incrementAndGet() == 1 ||mDatabase==null) {
+        LogUtil.d("open()  mOpenCounter:"+mOpenCounter);
+        if (mOpenCounter.incrementAndGet() == 1 ) {
             mDatabase = mDatabaseHelper.getWritableDatabase();
         }
         return mDatabase;
     }
 
     public synchronized void closeDatabase() {
+        LogUtil.d("closeDatabase()  mOpenCounter:"+mOpenCounter);
         if (mOpenCounter.decrementAndGet() == 0) {
-            if (mDatabase!=null) {
                 mDatabase.close();
-            }
         }
     }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SignAutoLogDao.java

@@ -54,8 +54,9 @@ public class SignAutoLogDao {
     public List<SignAutoLogEntity> getAllDatas() {
         List<SignAutoLogEntity> dataList = new ArrayList<>();
         SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
-        Cursor  cursor = stepDb.rawQuery("select * from SignAutoLog", null);
+        Cursor  cursor = null;
         try {
+            cursor = stepDb.rawQuery("select * from SignAutoLog", null);
             stepDb.beginTransaction();
             while (cursor.moveToNext()) {
                 int id = cursor.getInt(cursor.getColumnIndex("_id"));

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

@@ -81,6 +81,9 @@ import com.xzjmyk.pm.activity.volley.ArrayResult;
 import com.xzjmyk.pm.activity.volley.FastVolley;
 import com.xzjmyk.pm.activity.volley.Result;
 import com.xzjmyk.pm.activity.volley.StringJsonArrayRequest;
+import com.xzjmyk.pm.activity.wxapi.ApiConfig;
+import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
+import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 import com.xzjmyk.pm.activity.xmpp.CoreService;
 import com.xzjmyk.pm.activity.xmpp.ListenerManager;
 import com.xzjmyk.pm.activity.xmpp.listener.AuthStateListener;
@@ -186,6 +189,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
     private int mImStatus = AuthStateListener.AUTH_STATE_NOT;
     private List<SignAutoLogEntity> signAutoLogEntity;
     private List<SignAutoLogEntity> isendEntity;
+    private Boolean platform;
 
     public int getmImStatus() {
         return mImStatus;
@@ -610,7 +614,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
             }
         });
         PreferenceUtils.putInt(MainActivity.NEW_VERSION_RATING, 1);
-        PushManager.resumeWork(MyApplication.getInstance());
     }
 
     private void setbg(float alpha) {
@@ -752,7 +755,12 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         param.put("map", JSON.toJSONString(isendEntity));
         LogUtil.prinlnLongMsg("isendEntity", JSON.toJSONString(isendEntity));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        if (platform) {
+            headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
+        }
+        else {
+            headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        }
         ViewUtil.httpSendRequest(this, url, param, mUserCheckHander, headers, LOG_SEND_REQUEST, null, null, "post");
     }
 
@@ -800,7 +808,6 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         mWorksFragment = (WorksFragment) getSupportFragmentManager().findFragmentByTag(TAG_NEARBY);
         mGroupChatFragment = (GroupChatFragment) getSupportFragmentManager().findFragmentByTag(TAG_GROUP_CHAT);
         mMeFragment = (MeFragment) getSupportFragmentManager().findFragmentByTag(TAG_ME);
-
         mBusinessCircleFragment = (ContactFragment) getSupportFragmentManager().findFragmentByTag(TAG_BusinessCircle);
     }
 
@@ -829,6 +836,8 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
 
         unWorkReadTV.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, com.xzjmyk.pm.activity.ui.erp.util.Constants.NEW_ME_TAG, false) ? View.GONE : View.VISIBLE);
         Log.i("new_function_notice", new_function_notice + "");
+
+        platform = ApiUtils.getApiModel() instanceof ApiPlatform;
     }
 
     private void changeFragment(Fragment addFragment, String tag) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/DefaultResourceActivity.java

@@ -1,7 +1,6 @@
 package com.xzjmyk.pm.activity.ui.base;
 
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.support.v7.app.AppCompatActivity;
 
 /**
@@ -13,10 +12,10 @@ public class DefaultResourceActivity extends AppCompatActivity {
     /* System default config */
     private static Configuration config = new Configuration();
 
-    @Override
-    public Resources getResources() {
-        Resources res = super.getResources();
-        res.updateConfiguration(config, res.getDisplayMetrics());
-        return res;
-    }
+//    @Override
+//    public Resources getResources() {
+//        Resources res = super.getResources();
+//        res.updateConfiguration(config, res.getDisplayMetrics());
+//        return res;
+//    }
 }

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/activity/setting/SelectLanguageActivity.java

@@ -23,10 +23,8 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.crm.Business;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
@@ -57,19 +55,13 @@ public class SelectLanguageActivity extends BaseActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.btn_save:
-                LogUtil.d("MainActivity", "start:" + DateFormatUtil.getDateTimeStr());
-              new Handler().postDelayed(new Runnable() {
-                  @Override
-                  public void run() {
-                      if (!TextUtils.isEmpty(currentLanguage)) {
-                            switchLanguage(currentLanguage);
-                            switchLanguageAction();
-                        } else {
-                            switchLanguage("rCN");
-                            switchLanguageAction();
-                        }
-                  }
-              },10);
+              if (!TextUtils.isEmpty(currentLanguage)) {
+                    switchLanguage(currentLanguage);
+                    switchLanguageAction();
+                } else {
+                    switchLanguage("rCN");
+                    switchLanguageAction();
+                }
                 break;
             case android.R.id.home:
                 onBackPressed();
@@ -120,7 +112,7 @@ public class SelectLanguageActivity extends BaseActivity {
     }
 
     private void initData() {
-       String currentLanguage=   PreferenceUtils.getString(this, "language", "rCN");
+        currentLanguage=   PreferenceUtils.getString(this, "language", "rCN");
         Business b = new Business();
         b.setName(getString(R.string.language_sys));
         b.setCode("sys");
@@ -227,7 +219,7 @@ public class SelectLanguageActivity extends BaseActivity {
         it.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(it);
         overridePendingTransition(0, 0);
-//        System.exit(10);
+ //       System.exit(10);
 //        android.os.Process.killProcess(android.os.Process.myPid());
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -15,8 +15,8 @@ import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
     //TODO  上一个发布版本是79
-    private static final int DATABASE_VERSION = 79;//数据库版本号(每添加一个表要增加版本号)
-    public static String dataBaseName = "erp.db";//数据库名称
+    private static final int DATABASE_VERSION = 79;
+    public static String dataBaseName = "erp.db";
     public Context context;
 
     private static DBOpenHelper mInstance;

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/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -151,6 +151,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
         bundle.putParcelableArrayList("models", models);
+
         String url = "mobile/addMobileMac.action";
         Request request = new Request.Bulider()
                 .setUrl(url)
@@ -168,6 +169,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         if (iWorkView != null) iWorkView.showLoading();
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> form = new HashMap<>();
+
         //如果是erp就上传code
         if (!isB2b)
             form.put("cl_code", code);
@@ -203,6 +205,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         param.put("formStore", formStore);
         if (!isB2b)
             param.put("caller", "CardLog");
+
         String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url : "mobile/saveCardLog.action";
         Request request = new Request.Bulider()
                 .setUrl(url)
@@ -372,11 +375,11 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
         //获取当前最近的位置信息
         if (!ListUtils.isEmpty(locationList)) {
             float dis = 0;
-            boolean first = true;
+            boolean first=true;
             for (WorkLocationModel location : locationList) {
-                float distance = BaiduMapUtil.getInstence().autoDistance(location.getLocation());
-                if (first || dis > distance) {
-                    dis = distance;
+                float distance=BaiduMapUtil.getInstence().autoDistance(location.getLocation());
+                if (first||dis > distance) {
+                    dis =distance;
                     companyLocation = location;
                 }
             }
@@ -520,7 +523,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
             return;
         }
         if (isB2b)
-            loadWorkData(time);
+            loadWorkData(time);//TODO 如果是b2b的情况就先下拉打卡，因为没有排班设计只有默认班次
         else
             loadWorkSet(time);
     }
@@ -554,7 +557,7 @@ public class WorkPresenter implements OnHttpResultListener, IWorkPresenter {
      * @param models     班次以及打卡记录数据
      * @param macAddress mac地址
      */
-    private void submitWork(ArrayList<WorkModel> models, String macAddress) {
+    private void submitWork(final ArrayList<WorkModel> models, String macAddress) {
         subMitTime = System.currentTimeMillis();
         if (isB2b) {
             Bundle bundle = new Bundle();

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

@@ -194,11 +194,11 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                 CommonUtil.putSharedPreferencesBoolean(SettingActivity.this, Constants.NEW_UURUN, true);
                 if (isChecked) {
                     PreferenceUtils.putInt(MainActivity.UU_STEP, 1);
-                    PushManager.resumeWork(MyApplication.getInstance());
+//                    PushManager.resumeWork(MyApplication.getInstance());
 //
                     startActivity(new Intent(mContext, StepSplashActivity.class));
                 } else {
-                    PushManager.stopWork(MyApplication.getInstance());
+//                    PushManager.stopWork(MyApplication.getInstance());
                     PreferenceUtils.putInt(MainActivity.UU_STEP, 0);
 //                    stopService(intent);
                     Toast.makeText(mContext, getString(R.string.set_close_step_notice1), Toast.LENGTH_LONG).show();

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

@@ -479,10 +479,12 @@ public class ChatActivity extends ActionBackActivity
      */
     public boolean interprect(ChatMessage message) {
         int len = 0;
-        for (Friend friend : mBlackList) {
-            if (friend.getUserId().equals(mFriend.getUserId())) {
-                Toast.makeText(mContext, "已经加入黑名单,无法发送消息", Toast.LENGTH_SHORT).show();
-                len++;
+        if (mBlackList!=null) {
+            for (Friend friend : mBlackList) {
+                if (friend.getUserId().equals(mFriend.getUserId())) {
+                    Toast.makeText(mContext, "已经加入黑名单,无法发送消息", Toast.LENGTH_SHORT).show();
+                    len++;
+                }
             }
         }
         Log.d("wang", "....kkkkk");

WeiChat/src/main/java/com/xzjmyk/pm/newpedo/service/StepService.java

@@ -309,7 +309,7 @@ public class StepService extends Service implements SensorEventListener {
      * 开始倒计时，去存储步数到数据库中
      */
     private void startTimeCount() {
-        timeCount = new TimeCount(saveDuration, 1000);
+        timeCount = new TimeCount(saveDuration, 10000);
         timeCount.start();
     }
 

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/activity_feedback.xml

@@ -111,12 +111,17 @@
 
         <Button
             android:id="@+id/release_btn"
+            android:layout_marginTop="10dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:layout_width="match_parent"
-            android:layout_height="42dp"
-            android:background="@drawable/bg_btn"
-            android:text="@string/common_submit_button"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="30dp"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
             android:textColor="@color/white"
-            android:textSize="16sp" />
+            android:textSize="@dimen/text_main"
+            android:text="@string/common_save_button" />
     </LinearLayout>
 
 </RelativeLayout>

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/fragment_me.xml

@@ -192,7 +192,7 @@
 
         <RelativeLayout
             android:id="@+id/my_friend_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView

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

@@ -44,7 +44,7 @@
 
         <RelativeLayout
             android:id="@+id/my_client_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
@@ -77,7 +77,7 @@
 
         <RelativeLayout
             android:id="@+id/rl_uas_sys"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
             <TextView
                 android:id="@+id/tv_oa_desc"
@@ -185,7 +185,7 @@
 
         <RelativeLayout
             android:id="@+id/setting_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
             <TextView
                 android:id="@+id/tv_desc_business"
@@ -247,7 +247,7 @@
 
         <RelativeLayout
             android:id="@+id/goods_find"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView

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,6 +1110,23 @@
     <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">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>
     <string name="create_date">创建日期</string>
     <string name="select_contact">选择联系人</string>
     <string name="delete_business_ok">删除商机成功</string>

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

@@ -1237,4 +1237,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

@@ -1225,4 +1225,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

@@ -1578,4 +1578,11 @@
     <string name="Uploaded_successfully">上传成功</string>
     <string name="contect_is_much">联系人为必填项</string>
     <string name="context_is_much">拜访内容为必填项</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>