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

# Conflicts:
#	WeiChat/version.properties
#	app_third/libbdupdatesdk/src/main/AndroidManifest.xml

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Dec 14 15:53:54 CST 2018
-debugName=972
-versionName=652
-debugCode=972
-versionCode=207
+#Wed May 15 15:28:51 CST 2019
+debugName=975
+versionName=654
+debugCode=975
+versionCode=209

app_core/common/src/main/res/drawable/tab_job_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/icon_massage_selected" android:state_checked="true" android:state_enabled="true"/>
-    <item android:drawable="@drawable/icon_massage_nor"/>
+<item android:drawable="@drawable/icon_massage_selected" android:state_checked="true" android:state_enabled="true" />
+<item android:drawable="@drawable/icon_massage_nor" />
 
 </selector>

app_core/common/src/main/res/layout/activity_setting.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/oa_bg"
-              android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/oa_bg"
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -566,6 +566,7 @@
                     android:background="@drawable/oa_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/language_us_rl"
                 style="@style/commonSettingItem"

app_modular/applogin/src/main/java/com/modular/login/activity/PersonalRegActivity.java

@@ -51,7 +51,7 @@ public class PersonalRegActivity extends SupportToolBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.personal_reg_activity);
-     setTitle(getString(R.string.person_register));
+         setTitle(getString(R.string.person_register));
 
         initView();
     }

app_modular/appmusic/src/main/java/com/usoftchina/music/MusicService.java

@@ -40,9 +40,9 @@ public class MusicService extends Service {
     private void initMusic() {
         Log.i(TAG, "onStartCommand");
         try {
-            mediaPlayer =  MediaPlayer.create(this, R.raw.yingtang);
-            mediaPlayer.prepare();
-            mediaPlayer.setLooping(true);
+//            mediaPlayer =  MediaPlayer.create(this, R.raw.yingtang);
+//            mediaPlayer.prepare();
+//            mediaPlayer.setLooping(true);
         } catch (Exception e) {
             e.printStackTrace();
         }