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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 24 09:03:45 CST 2018
-debugName=360
+#Thu May 24 09:45:00 CST 2018
+debugName=364
 versionName=630
-debugCode=360
+debugCode=364
 versionCode=170

app_core/common/src/main/assets/work_menu.json

@@ -55,6 +55,16 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_work_yingtang_song",
+        "menuIcon": "icon_music_yingtang",
+        "menuActivity": "com.usoftchina.pay.MainMusicActivity",
+        "menuTag": "local_yingtang_song",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

app_core/common/src/main/assets/work_menu_b2b.json

@@ -55,6 +55,16 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "str_work_yingtang_song",
+        "menuIcon": "icon_music_yingtang",
+        "menuActivity": "com.usoftchina.pay.MainMusicActivity",
+        "menuTag": "local_yingtang_song",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       }
     ]
   },

app_core/common/src/main/assets/work_menu_personal.json

@@ -56,6 +56,17 @@
         "caller": "",
         "isHide": false
       }
+    ,
+      {
+        "isLocalMenu": true,
+        "menuName": "str_work_yingtang_song",
+        "menuIcon": "icon_music_yingtang",
+        "menuActivity": "com.usoftchina.pay.MainMusicActivity",
+        "menuTag": "local_yingtang_song",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
+      }
     ]
   }
 ]

app_core/common/src/main/res/values-en/strings.xml

@@ -1491,6 +1491,7 @@
     <string name="str_work_uu_sports">UU Sport</string>
     <string name="str_work_invite_register">invitation to register</string>
     <string name="str_work_uu_education">UU education</string>
+    <string name="str_work_yingtang_song">yingtang song</string>
 
     <string name="str_administrative_office">OA</string>
     <string name="str_work_work_approval">my reviews</string>

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1555,6 +1555,7 @@
     <string name="str_work_uu_sports">UU运动</string>
     <string name="str_work_invite_register">邀请注册</string>
     <string name="str_work_uu_education">UU课堂</string>
+    <string name="str_work_yingtang_song">英唐之歌</string>
 
     <string name="str_administrative_office">行政办公</string>
     <string name="str_work_work_approval">我的审批</string>

app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1542,6 +1542,7 @@
     <string name="str_work_uu_sports">UU運動</string>
     <string name="str_work_invite_register">邀請註冊</string>
     <string name="str_work_uu_education">UU课堂</string>
+    <string name="str_work_yingtang_song">英唐之歌</string>
 
     <string name="str_administrative_office">行政辦公</string>
     <string name="str_work_work_approval">我的審批</string>

app_core/common/src/main/res/values/strings.xml

@@ -1892,6 +1892,7 @@
     <string name="str_work_uu_sports">UU运动</string>
     <string name="str_work_invite_register">邀请注册</string>
     <string name="str_work_uu_education">UU课堂</string>
+    <string name="str_work_yingtang_song">英唐之歌</string>
 
     <string name="str_administrative_office">行政办公</string>
     <string name="str_work_work_approval">我的审批</string>

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

@@ -57,11 +57,14 @@ import com.core.model.WorkModel;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
+import com.core.utils.helper.LoginHelper;
+import com.core.utils.sp.UserSp;
 import com.core.widget.view.SwitchView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
 import com.me.network.app.http.rx.ResultListener;
 import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.scwang.smartrefresh.layout.util.DensityUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.view.NewStepActivity;
@@ -181,18 +184,18 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
         mExitBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent("com.usoftchina.pay.MainMusicActivity"));
-//                PopupWindowHelper.showAlart(SettingActivity.this, getString(R.string.app_name), getString(R.string.exit_tips), new PopupWindowHelper.OnSelectListener() {
-//                    @Override
-//                    public void select(boolean selectOk) {
-//                        if (selectOk){
-//                            UserSp.getInstance(mContext).clearUserInfo();
-//                            ViewUtil.clearAccount(mContext);
-//                            LoginHelper.broadcastLogout(mContext);
-//                            SettingActivity.this.finish();
-//                        }
-//                    }
-//                });
+//                startActivity(new Intent("com.usoftchina.pay.MainMusicActivity"));
+                PopupWindowHelper.showAlart(SettingActivity.this, getString(R.string.app_name), getString(R.string.exit_tips), new PopupWindowHelper.OnSelectListener() {
+                    @Override
+                    public void select(boolean selectOk) {
+                        if (selectOk){
+                            UserSp.getInstance(mContext).clearUserInfo();
+                            ViewUtil.clearAccount(mContext);
+                            LoginHelper.broadcastLogout(mContext);
+                            SettingActivity.this.finish();
+                        }
+                    }
+                });
             }
         });
         mCacheTv = (TextView) findViewById(R.id.cache_tv);

app_modular/appmusic/src/main/java/com/lg/lrcview_master/LrcView.java

@@ -33,7 +33,7 @@ public class LrcView extends View implements ILrcView {
 	/**所有的歌词***/
 	private List<LrcRow> mLrcRows;
 	/**无歌词数据的时候 显示的默认文字**/
-	private static final String DEFAULT_TEXT = "英唐智慧，全球共享";
+	private static final String DEFAULT_TEXT = "智慧英唐，全球共享";
 	/**默认文字的字体大小**/
 	private static final float SIZE_FOR_DEFAULT_TEXT = 60;