Merge branch 'CJL-NEW' into NewFilePath

wxr

2020-12-11 fb1d2ee8a53c56dbb22f38fccb83335fd489456f

 HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs

@@ -67,7 +67,7 @@
                }
                string msg = function.name + Language.StringByID(StringId.CollectionCancelled);
                LoadDeviceFunctionControlZone();
                function.SaveFunctionData();
                function.SaveFunctionData(true);
                new PublicAssmebly().TipMsgAutoClose(msg, true);
            };
        }
@@ -81,7 +81,7 @@
                scene.collect = false;
                string msg = scene.name + Language.StringByID(StringId.CollectionCancelled);
                LoadSceneFunctionControlZone();
                scene.SaveSceneData();
                scene.SaveSceneData(true);
                new PublicAssmebly().TipMsgAutoClose(msg, true);
            };
        }