Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into dev_login

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

@@ -83,6 +83,7 @@ public class AddBusinessActivity extends OABaseActivity implements View.OnClickL
     }
 
     private void initView() {
+        getSupportActionBar().setTitle(R.string.crm_creat_business);
         Intent intent = getIntent();
         isUpdata = intent == null ? false : intent.getBooleanExtra("isUpdata", false);
         if (isUpdata) {

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

@@ -955,12 +955,16 @@ public class ClientActivity extends BaseActivity implements View.OnClickListener
                     }
                     break;
             }
-            if (mHttpCount > 4) {
-                if (mPullToRefreshScrollView.isRefreshing()) {
-                    ViewUtil.ToastMessage(ClientActivity.this, getString(R.string.common_notlinknet), Style.holoGreenLight, 2000);
-                    mPullToRefreshScrollView.onRefreshComplete();
-                }
+            if (mPullToRefreshScrollView.isRefreshing()) {
+                mPullToRefreshScrollView.onRefreshComplete();
             }
+//            未知请求次数达到限制出现网络未连接的提示，先关闭
+//            if (mHttpCount > 4) {
+//                if (mPullToRefreshScrollView.isRefreshing()) {
+//                    ViewUtil.ToastMessage(ClientActivity.this, getString(R.string.common_notlinknet), Style.holoGreenLight, 2000);
+//                    mPullToRefreshScrollView.onRefreshComplete();
+//                }
+//            }
         }
     };
 

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

@@ -62,7 +62,7 @@ public class SearchSelectActivity extends BaseActivity {
     }
 
     private void initView() {
-
+        getSupportActionBar().setTitle(R.string.describe);
         voiceSearchView.setHineText(getString(R.string.search_select_hint));
         pullToRefreshListView.setMode(PullToRefreshBase.Mode.PULL_FROM_END);
         seachResult = new ArrayList<>();

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

@@ -98,6 +98,7 @@ public class SelectAimActivity extends OABaseActivity implements ISelectAim {
     }
 
     private void initView() {
+        getSupportActionBar().setTitle(R.string.activity_select_aims);
         BaiduMapUtil.getInstence().setMapViewPoint(mapView, MyApplication.getInstance().getBdLocationHelper().getLocation());
         listview.setLayoutManager(new LinearLayoutManager(this));
         RecycleViewDivider viewDivider = new RecycleViewDivider(this, LinearLayout.HORIZONTAL, 1, getResources().getColor(R.color.gray_light));

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

@@ -32,7 +32,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.AddVisitReportActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAMainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -300,7 +300,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.test_rl).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Intent intent = new Intent(ct, AddVisitReportActivity.class);
+                Intent intent = new Intent(ct, OAMainActivity.class);
                 intent.putExtra(AppConfig.IS_ADMIN, true);//上传管理员状态
                 startActivity(intent);
             }
@@ -313,14 +313,14 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(new Intent(ct, TimeStatisticsActivity.class));
             }
         });
-        
-        
+
+
         boolean seting = CommonUtil.getSharedPreferencesBoolean(ct, Constants.NEW_SETING);
         tv_menu_setting.setVisibility(seting ? View.GONE : View.VISIBLE);
 //        tv_oa_desc.setVisibility(seting ? View.GONE : View.VISIBLE);
 //        iv_desc_oa.setVisibility(seting ? View.GONE : View.VISIBLE);
         CommonUtil.clearSharedPreferences(ct, "seting");
-        CommonUtil.clearSharedPreferences(ct,"seting_1");
+        CommonUtil.clearSharedPreferences(ct, "seting_1");
     }
 
     @Override