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

WeiChat/src/main/res/drawable/shape_brounds_bottom.xml

@@ -15,7 +15,7 @@
             <item android:bottom="0.0dp" android:left="-2.7dp" android:right="-2.7dp" android:top="-2.7dp">
                 <shape>
                     <solid android:color="@color/white" />
-                    <stroke android:width="2.5dp" android:color="@color/yellow_home" />
+                    <stroke android:width="2.5dp" android:color="#1084D1" />
                 </shape>
             </item>
         </layer-list>

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

@@ -15,7 +15,7 @@
             <item android:bottom="0.0dp" android:left="-2.7dp" android:right="-2.7dp" android:top="-2.7dp">
                 <shape>
                     <solid android:color="@color/white" />
-                    <stroke android:width="2.5dp" android:color="@color/yellow_home" />
+                    <stroke android:width="2.5dp" android:color="#1084D1" />
                 </shape>
             </item>
         </layer-list>

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

@@ -307,9 +307,11 @@ public class SettingActivity extends SupportToolBarActivity implements View.OnCl
                 try {
                     //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
                     if (o.toString().contains("result")) {
-                        if (!CommonUtil.isReleaseVersion()) {
-                            businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        } else if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
+//                        if (!CommonUtil.isReleaseVersion()) {
+//                            businessmen_setting_rl.setVisibility(View.VISIBLE);
+//                        } else
+
+                            if ("1".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
                         } else {
                             businessmen_setting_rl.setVisibility(View.GONE);

app_modular/appmessages/src/main/AndroidManifest.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.modular.appmessages">
+<manifest package="com.modular.appmessages"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
-        <activity android:name=".activity.MsgsSecondCommonActivity"
-            android:theme="@style/MainBaseTheme"/>
+        <activity
+            android:name=".activity.MsgsSecondCommonActivity"
+            android:theme="@style/MainBaseTheme" />
         <activity android:name=".activity.PlatMsgThirdActivity" />
         <activity android:name=".activity.MsgThirdWebActivity" />
         <activity android:name=".activity.ProcessB2BActivity">
@@ -48,8 +49,8 @@
             android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <!--<intent-filter>-->
-                <!--<action android:name="com.modular.task.TaskActivity" />-->
-                <!--<category android:name="android.intent.category.DEFAULT" />-->
+            <!--<action android:name="com.modular.task.TaskActivity" />-->
+            <!--<category android:name="android.intent.category.DEFAULT" />-->
             <!--</intent-filter>-->
         </activity>
 
@@ -63,7 +64,8 @@
             android:name=".activity.Subscription2Activity"
             android:label="@string/subscribe_title" />
         <activity
-            android:name=".activity.SubcribeManageActivity">
+            android:name=".activity.SubcribeManageActivity"
+            android:theme="@style/StyledIndicators">
             <intent-filter>
                 <action android:name="com.modular.company.SubcribeManageActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

app_modular/appworks/src/main/AndroidManifest.xml

@@ -414,14 +414,17 @@
         <activity
             android:name=".activity.PublicInquiryListActivity"
             android:hardwareAccelerated="true"
+            android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activity.CustomerInquiryListActivity"
             android:hardwareAccelerated="true"
+            android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity
             android:name=".activity.PurchaseOrderListActivity"
             android:hardwareAccelerated="true"
+            android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".activity.PublicInquiryDetailActivity" />
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -310,7 +310,7 @@ public class PurchaseDetailsActivity extends BaseNetActivity implements OnSmartH
                     changeStatus = true;
                     varStatus = Constants.FLAG.STATE_PURCHASE_ORDER_TODO;
                 }
-            } else if ("201".equals(status) && "1".equals(reply)) {
+            } else if ("201".equals(status)) {
                 if (!varStatus.equals(Constants.FLAG.STATE_PURCHASE_ORDER_DONE)) {
                     changeStatus = true;
                     varStatus = Constants.FLAG.STATE_PURCHASE_ORDER_DONE;