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

# Conflicts:
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -186,11 +186,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
 
         rl_app_update.setOnClickListener(this);
         close_push_rl.setOnClickListener(this);
-        if (BaseConfig.isDebug() || "U0736".equals(CommonUtil.getEmcode())) {
+        if (BaseConfig.isDebug()||"U0736".equals(CommonUtil.getEmcode())){
             close_push_rl.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View view) {
-                    startActivity(new Intent(ct, SelectIpActivity.class));
+                    startActivity(new Intent(ct,SelectIpActivity.class));
                     return false;
                 }
             });
@@ -426,7 +426,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             startActivity(intent);
         } else if (v.getId() == R.id.about_us_rl) {
             startActivity(new Intent(mContext, AboutActivity.class));
-            // startActivity(new Intent("com.modular.work.ContactsListActivity"));
+          // startActivity(new Intent("com.modular.work.ContactsListActivity"));
         } else if (v.getId() == R.id.share_rl) {
             share();
         } else if (v.getId() == R.id.rl_app_update) {
@@ -494,11 +494,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
             intent = new Intent(mContext, FlightsActivity.class);
             startActivityForResult(intent, 0x12);
             closePopupWindow();
-        } else if (v.getId() == R.id.face_setting_tv) {
+        }else if (v.getId()==R.id.face_setting_tv){
             intent = new Intent(mContext, FaceManageActivity.class);
             startActivityForResult(intent, 0x13);
             closePopupWindow();
-        } else if (v.getId() == R.id.office_addr_setting_tv) {
+        }else if (v.getId() == R.id.office_addr_setting_tv) {
             startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
             closePopupWindow();
         } else if (v.getId() == R.id.my_rule_setting_tv) {
@@ -760,6 +760,7 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                 NotifyUtil.cancelAll();
                 BDAutoUpdateSDK.cpUpdateInstall(MyApplication.getInstance(), apkPath);
             } catch (Exception e) {
+                e.printStackTrace();
             }
         }