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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -197,7 +197,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
         sendqzonecancel_tv = (TextView) mMoreMenuView.findViewById(R.id.send_qzone_cancel);
         mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
         mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
-        mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
+        mMoreWindow.setBackgroundDrawable(mContext.getResources().getDrawable(com.uas.appme.R.drawable.bg_popuwin));
         mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
             @Override
             public void onDismiss() {

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

@@ -1,54 +1,45 @@
 <?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="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/white">
+<LinearLayout
+    style="@style/commonPopView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <TextView
-        android:id="@+id/send_qzone_text"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/qzone_send_word"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/send_qzone_picture"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/qzone_send_picture"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/send_qzone_video"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:text="@string/qzone_send_video"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/black_gray"/>
-    <TextView
-        android:id="@+id/send_qzone_cancel"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:text="@string/common_cancel"
-        android:textSize="15sp"/>
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_common_pop_option_item"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/send_qzone_text"
+            style="@style/commonPopItemTop"
+            android:text="@string/qzone_send_word"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid"/>
+        <TextView
+            android:id="@+id/send_qzone_picture"
+            style="@style/commonPopItem"
+            android:text="@string/qzone_send_picture"
+            />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid"/>
+        <TextView
+            android:id="@+id/send_qzone_video"
+            style="@style/commonPopItem"
+            android:text="@string/qzone_send_video"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:background="@color/black_gray"/>
+        <TextView
+            android:id="@+id/send_qzone_cancel"
+            style="@style/commonPopCancelItem"
+            android:text="@string/common_cancel"
+            />
+    </LinearLayout>
 </LinearLayout>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 24 14:45:49 CST 2018
-debugName=374
+#Thu May 24 16:37:00 CST 2018
+debugName=376
 versionName=630
-debugCode=374
+debugCode=376
 versionCode=170

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

@@ -195,7 +195,8 @@
             <RelativeLayout
                 android:id="@+id/businessmen_setting_rl"
                 style="@style/commonSettingItem"
-                android:layout_marginTop="12dp">
+                android:layout_marginTop="12dp"
+                android:visibility="gone">
 
                 <View
                     android:layout_width="match_parent"

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

@@ -1,54 +1,45 @@
 <?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="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/white">
+<LinearLayout
+    style="@style/commonPopView"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <TextView
-        android:id="@+id/send_qzone_text"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/qzone_send_word"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/send_qzone_picture"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:text="@string/qzone_send_picture"
-        android:textColor="@color/black"
-        android:textSize="15sp"/>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.3dp"
-        android:background="@color/button_invalid"/>
-    <TextView
-        android:id="@+id/send_qzone_video"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:text="@string/qzone_send_video"
-        android:textSize="15sp"/>
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:background="@color/black_gray"/>
-    <TextView
-        android:id="@+id/send_qzone_cancel"
-        android:layout_width="match_parent"
-        android:layout_height="45dp"
-        android:gravity="center"
-        android:textColor="@color/black"
-        android:text="@string/common_cancel"
-        android:textSize="15sp"/>
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_common_pop_option_item"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/send_qzone_text"
+            style="@style/commonPopItemTop"
+            android:text="@string/qzone_send_word"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid"/>
+        <TextView
+            android:id="@+id/send_qzone_picture"
+            style="@style/commonPopItem"
+            android:text="@string/qzone_send_picture"
+           />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.3dp"
+            android:background="@color/button_invalid"/>
+        <TextView
+            android:id="@+id/send_qzone_video"
+            style="@style/commonPopItem"
+            android:text="@string/qzone_send_video"
+           />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:background="@color/black_gray"/>
+        <TextView
+            android:id="@+id/send_qzone_cancel"
+            style="@style/commonPopCancelItem"
+            android:text="@string/common_cancel"
+            />
+    </LinearLayout>
 </LinearLayout>

app_core/common/src/main/res/menu/menu_list.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/push"
         android:title="@string/more"
-        android:icon="@drawable/xlist"
+        android:icon="@drawable/ic_oa_list"
         app:showAsAction="ifRoom" />
 
 </menu>

app_modular/appme/src/main/res/menu/bsetting_more.xml

@@ -1,12 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.xzjmyk.pm.activity.MainActivity">
+xmlns:app="http://schemas.android.com/apk/res-auto"
+xmlns:tools="http://schemas.android.com/tools"
+tools:context="com.xzjmyk.pm.activity.MainActivity">
 
-    <item
-        android:id="@+id/booking_set_list"
-        android:title="@string/more"
-        android:icon="@drawable/xlist"
-        app:showAsAction="ifRoom" />
+<item
+    android:id="@+id/booking_set_list"
+    android:title="@string/more"
+    android:icon="@drawable/ic_oa_list"
+    app:showAsAction="ifRoom" />
 
 </menu>

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/ExpenseReimbursementActivity.java

@@ -1981,7 +1981,8 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         if (item.getItemId() == R.id.push){
             startActivity(new Intent(mContext, FormListSelectActivity.class)
                     .putExtra("caller", caller)
-                    .putExtra("title", getToolBarTitle().toString()));
+                    .putExtra("title", getToolBarTitle().toString())
+            );
         }
         if (item.getItemId() == android.R.id.home){
 //            if (formid != 0){