1.处理关于商机列表展示时候因为新老界面的差别问题，产生的类类型不匹配所引起的闪退现象问题

2.处理6.0版本手机无法获取设备id并且不能正常登陆问题
3.更新so文件防止闪退，但是出现启动录音失败的问题
4.更新部分翻译

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

@@ -129,7 +129,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
         ViewUtils.inject(this);
-
         initView();
     }
 
@@ -167,7 +166,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             mSex = getString(R.string.user_body);
         } else {
             tv_sex.setText(getString(R.string.user_girl));
-            mSex =getString(R.string.user_girl);
+            mSex = getString(R.string.user_girl);
             //  rbGrid.setChecked(true);
         }
         tv_birthday.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
@@ -502,7 +501,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(mConfig.USER_UPDATE, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                Log.i("gongepngming", "arg0=" + arg0.getMessage());
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 ToastUtil.showErrorNet(BaseInfoActivity.this);
             }
@@ -523,7 +521,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
 
     private void saveData() {
         if (!mUser.getNickName().equals(mTempData.getNickName())) {
-            Log.d("wang", "更新数据库" + mTempData.getNickName());
             MyApplication.getInstance().mLoginUser.setNickName(mTempData.getNickName());
             UserDao.getInstance().updateNickName(mTempData.getUserId(), mTempData.getNickName());// 更新数据库
         }

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

@@ -98,7 +98,7 @@ public class OAAdapter extends BaseAdapter {
             else holder.status_img.setVisibility(View.GONE);
         } else if (model.isVisitRecord()) {
             handler += model.getTime2Str("HH:mm");
-            holder.status_tv.setText("已拜访");
+            holder.status_tv.setText(R.string.visited);
         }
         holder.handler_tv.setText(handler);
         if (model.isMission())

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/stream/PermissionHelper.java

@@ -5,12 +5,9 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.util.PermissionUtil;
 
-import static com.umeng.socialize.utils.DeviceConfig.context;
-
 /**
  * Created by Bitliker on 2017/6/5.
  */
@@ -59,7 +56,7 @@ public class PermissionHelper {
         } else {
             PackageManager pm = activity.getPackageManager();
             for (String permission : permissions)
-                if (pm.checkPermission(permission, context.getPackageName()) == PackageManager.PERMISSION_GRANTED)
+                if (pm.checkPermission(permission, activity.getPackageName()) == PackageManager.PERMISSION_GRANTED)
                     return true;
         }
         return false;
@@ -67,7 +64,6 @@ public class PermissionHelper {
 
     // 判断是否缺少权限
     private boolean lacksPermission(String permission) {
-        return ContextCompat.checkSelfPermission(activity, permission) ==
-                PackageManager.PERMISSION_DENIED;
+        return ContextCompat.checkSelfPermission(activity, permission) == PackageManager.PERMISSION_DENIED;
     }
 }

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

@@ -17,5 +17,5 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/empty_img"
         android:layout_centerHorizontal="true"
-        android:text="未找到公司位置，请搜索地址" />
+        android:text="@string/not_find_company_search" />
 </RelativeLayout>

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

@@ -696,6 +696,9 @@
     <string name="cancel_attention">取消关注</string>
     <string name="delete_all">彻底删除</string>
     <string name="remark_name_format_error">备注名不合法，只允许中文、英文、字母和下划线，且长度为3至10个字符</string>
+    <string name="not_find_company_search">未找到公司位置，请搜索地址</string>
+    <string name="visited">已拜访</string>
+
     <!--end by Bitliker-->
 
     <!--start by Arison-->