!4836 【包管理子系统】修改配置orientation字段的ability类型为page

Merge pull request !4836 from ry/master

bundlemanager/bundle_standard/bundlemanager/actsbundlemanagertest/src/main/js/test/ExampleJsunit.test.js

@@ -1619,15 +1619,15 @@ describe('ActsBundleManagerTest', function () {
             if (datainfo.bundleName == NAME4) {
                 expect(datainfo.name).assertEqual("com.example.myapplication.MainAbility");
                 expect(datainfo.type).assertEqual(demo.AbilityType.DATA);
+                expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.UNSPECIFIED);
                 expect(datainfo.bundleName).assertEqual(NAME4);
-                expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.FOLLOW_RECENT);
                 queryResultCount++;
             }
             if (datainfo.bundleName == NAME5) {
                 expect(datainfo.name).assertEqual("com.example.myapplication.MainAbility");
                 expect(datainfo.type).assertEqual(demo.AbilityType.PAGE);
                 expect(datainfo.bundleName).assertEqual(NAME5);
-                expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.UNSPECIFIED);
+                expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.FOLLOW_RECENT);
                 queryResultCount++;
             }
         }
@@ -1686,13 +1686,13 @@ describe('ActsBundleManagerTest', function () {
             if (datainfo.bundleName == NAME4) {
                 expect(datainfo.name).assertEqual("com.example.myapplication.MainAbility");
                 expect(datainfo.bundleName).assertEqual(NAME4);
-                expect(datainfo.orientation).assertEqual(3);
+                expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.UNSPECIFIED);
                 queryResultCount++;
             }
             if (datainfo.bundleName == NAME5) {
                 expect(datainfo.name).assertEqual("com.example.myapplication.MainAbility");
                 expect(datainfo.bundleName).assertEqual(NAME5);
-                expect(datainfo.orientation).assertEqual(0);
+                expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.FOLLOW_RECENT);
                 queryResultCount++;
             }
         }

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/src/main/config.json

@@ -45,7 +45,6 @@
         "isVisible": "true",
         "launchType": "standard",
         "language": "C++", 
-        "orientation": "followrecent",
         "uri":"dataability://"
       }
     ],

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/src/main/config.json

@@ -44,6 +44,7 @@
         "type": "page",
         "isVisible": "true",
         "launchType": "standard",
+        "orientation": "followrecent",
         "language": "C++"
       }
     ],

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/src/main/config.json

@@ -40,8 +40,7 @@
         "type": "service",
         "isVisible": "true",
         "launchType": "singleton",
-        "language": "C++",
-        "orientation": "landscape"
+        "language": "C++"
       }
     ],
     "deviceType": [

bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/src/main/config.json

@@ -40,7 +40,7 @@
         "icon": "$media:icon",
         "description": "$string:mainability_description",
         "label": "$string:app_name",
-        "type": "service",
+        "type": "page",
         "isVisible": "true",
         "launchType": "singleton",
         "language": "C++",