app/src/main/java/cn/sagacloud/cadengine/GzipUtil.java

@@ -155,6 +155,8 @@ public class GzipUtil {
         {
             return "";
         }
+
+
     }
 }
 

app/src/main/java/cn/sagacloud/cadengine/MainActivity.kt

@@ -19,7 +19,7 @@ import org.jetbrains.anko.uiThread
 
 class MainActivity : AppCompatActivity() {
     val scene = FloorScene()
-    val path = "Fl42010500018b580334dcf111e8a553db1eadfac99320190803114958bim.jsonz"
+    val path = "base/0d5b6dd89b7011eb88b7b12cd4310b6f.jsonz"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,9 +38,8 @@ class MainActivity : AppCompatActivity() {
             val graphyFmItem = GraphyFmItem()
             graphyFmItem.show()
             graphyFmItem.isVisible = true
-
             graphyFmItem.moveTo(300f,300f)
-            graphyFmItem.rotate = 60f // (20f*Math.PI / 180f) as Float
+//            graphyFmItem.rotate = 60f // (20f*Math.PI / 180f) as Float
             graphyFmItem.isTransform = false
             scene.addItem(graphyFmItem)
             val graphyTwoItem = GraphyTwoItem()
@@ -52,18 +51,22 @@ class MainActivity : AppCompatActivity() {
 //            graphyTwoItem.flag = true
 //            graphyTwoItem.parent = graphyFmItem
             graphyTwoItem.moveTo(100f,100f)
-//            graphyTwoItem.color = Color.RED
+            graphyTwoItem.color = Color.RED
 
 
-//            scene.addItem(graphyTwoItem)
+            scene.addItem(graphyTwoItem)
             /** 主线程处理ui */
             uiThread {
 
 
                 /** 适应屏幕大小 */
-//                graphyView.fitSceneToView()
-//                /** 限定移动范围不超出屏幕 */
+                graphyView.fitSceneToView()
+                /** 限定移动范围不超出屏幕 */
 //                graphyView.moveRange()
+                graphyView.post {
+                    Log.e("viewW",graphyView.width.toString())
+                }
+                Log.e("viewH",graphyView.measuredHeight.toString())
             }
         }
     } // Function onCreate()

app/src/main/res/values/styles.xml

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -9,3 +9,4 @@
     </style>
 
 </resources>
+

sybotan-android-graphy/build/kotlin/compileDebugKotlin/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-41
-24
+94
+77

sybotan-android-graphy/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-Ь“
ЮNЩCо>А7И@БKщ7э8Г0и)ц>з:Ф$
+А—
ВNщ@И4Ф1ж2о,С+у*С(Ъ)О'Ь#у-ВCб1И'о"Х"ш"Ш$а)ы'Ь!МЩт$кя щ(м%щНь?А г"ЖЩЯеДлЭифтмРПНпМрдЖшгкРЪфГюуншо К!рДюЛТЩФКхЧУфМеиоЮв 

sybotan-android-graphy/src/main/java/com/sybotan/android/graphy/SGraphyScene.kt

@@ -186,7 +186,7 @@ open class SGraphyScene {
     fun worldRect(): RectF {
         val rect = RectF()
 
-        for (item in rootNode.children) {        // 依次取item列中的所有item。将所有item的边界做并焦处理。
+        for (item in rootNode.children) {        // 依次取item列中的所有item。将所有item的边界做并集处理。
             rect.union(item.boundingRect().adjusted(item.pos))
         }
 

sybotan-android-graphy/src/main/java/com/sybotan/android/graphy/SGraphyView.kt

@@ -28,7 +28,6 @@ import android.graphics.*
 import android.util.AttributeSet
 import android.util.Log
 import android.view.*
-import android.view.MotionEvent
 import com.sybotan.android.graphy.enums.SGraphyViewTouchState
 import com.sybotan.android.graphy.events.SGraphyViewMoveEvent
 import com.sybotan.android.graphy.events.SGraphyViewZoomEvent
@@ -125,6 +124,12 @@ open class SGraphyView(context: Context, attrs: AttributeSet? = null)
         initView()
     } // init
 
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        Log.e("w",widthMeasureSpec.toString())
+        Log.e("h",heightMeasureSpec.toString())
+    }
+
     /**
      * 适配视图到视图
      */
@@ -133,12 +138,25 @@ open class SGraphyView(context: Context, attrs: AttributeSet? = null)
         if (null == scene) {
             return
         }
+//        val w = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+//        val h = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED)
+//        this.measure(width, height)
+//        val h: Int = this.getMeasuredHeight()
+//        val w: Int = this.getMeasuredWidth()
+
+        this.post {
+            val w = width.toFloat()
+            val h = height.toFloat()
+
+            val rect = scene!!.worldRect()
+            setCenterPoint( PointF(rect.centerX(), rect.centerY()),
+                    min(w / rect.width(), h / rect.height()) * fitrate)
+//            Log.e("w",w.toString())
+//            Log.e("h",h.toString())
+//            Log.e("rect1",rect.toJson())
+//            Log.e("min",(min(w / rect.width(), h / rect.height())).toJson())
+        }
 
-        val w = width.toFloat()
-        val h = height.toFloat()
-        val rect = scene!!.worldRect()
-        setCenterPoint( PointF(rect.centerX(), rect.centerY()),
-                min(w / rect.width(), h / rect.height()) * fitrate)
     } // Function FitView()
 
     /**