合并全部代码完成

黄学彪

2019-11-28 3a26f6025130dcaae4aa82ea19b16ad902450eb8

 ZigbeeApp/Shared/Phone/Device/Category/CategorySceneSelectImgByLocal.cs

@@ -70,8 +70,8 @@
            };
            bodyFrameLayout.AddChidren(scrollView);

            int k = 1;
            for (int j = 0; j < 2; j++)
            int k = 0;
            for (int j = 0; j < 5; j++)
            {
                var itemView = new FrameLayout()
                {
@@ -86,9 +86,10 @@
                        Width=Application.GetMinRealAverage(467),
                        Height=Application.GetMinRealAverage(311),
                        Gravity=Gravity.CenterVertical,
                        UnSelectedImagePath = $"SceneIcon/{k}.png",
                        UnSelectedImagePath = $"SceneIcon/{k}.jpg",
                    };
                    itemView.AddChidren(icon);
                    icon.SetViewShadow(true);
                    k++;

                    EventHandler<MouseEventArgs> selectIcon = (sender, e) =>