|
@@ -92,38 +92,24 @@ class GraphyActivity : AppCompatActivity() {
|
|
* 加载墙数据
|
|
* 加载墙数据
|
|
*/
|
|
*/
|
|
private fun loadWalls() {
|
|
private fun loadWalls() {
|
|
- val revit = SJsonUtil.fromJson<Revit>(applicationContext.assets.open("WallDatas.json"), PropertyNamingStrategy.UPPER_CAMEL_CASE)
|
|
|
|
- Log.d(TAG, "name=${revit.name}")
|
|
|
|
- Log.d(TAG, "${revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!}")
|
|
|
|
-
|
|
|
|
- Log.d(TAG, "line.size=${revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!.size}")
|
|
|
|
- //for ( line in revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!) {
|
|
|
|
- for ( line in revit.floorDatas!![0].lines!!) {
|
|
|
|
- val pointList = ArrayList<PointF>()
|
|
|
|
- Log.d(TAG, "point.size=${line.size}")
|
|
|
|
- for (t in 0 until line.size) {
|
|
|
|
- val p1 = line[t].split(",")
|
|
|
|
- val point = PointF(p1[0].toFloat() * 20 + 12000, -p1[1].toFloat() * 20 -20600)
|
|
|
|
- pointList.add(point)
|
|
|
|
- }
|
|
|
|
- scene.addItem(GraphyWallItem(pointList))
|
|
|
|
- }
|
|
|
|
- println()
|
|
|
|
-// for ( line in revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!) {
|
|
|
|
-// var p1 = line[0].split(",")
|
|
|
|
-// var x1 = p1[0].toFloat() * 3 + 500
|
|
|
|
-// var y1 = -p1[1].toFloat() * 3 + 1200
|
|
|
|
-// for (t in 1 until line.size) {
|
|
|
|
-// var p1 = line[t].split(",")
|
|
|
|
-// var x2 = p1[0].toFloat() * 3 + 500
|
|
|
|
-// var y2 = -p1[1].toFloat() * 3 + 1200
|
|
|
|
-// scene.addLineItem(x1, y1, x2, y2)
|
|
|
|
|
|
+// val revit = SJsonUtil.fromJson<Revit>(applicationContext.assets.open("WallDatas.json"), PropertyNamingStrategy.UPPER_CAMEL_CASE)
|
|
|
|
+// Log.d(TAG, "name=${revit.name}")
|
|
|
|
+// Log.d(TAG, "${revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!}")
|
|
//
|
|
//
|
|
-// x1 = x2
|
|
|
|
-// y1 = y2
|
|
|
|
-// break
|
|
|
|
|
|
+// Log.d(TAG, "line.size=${revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!.size}")
|
|
|
|
+// //for ( line in revit.floorDatas!![revit.floorDatas!!.size - 1].lines!!) {
|
|
|
|
+// for ( line in revit.floorDatas!![0].lines!!) {
|
|
|
|
+// val pointList = ArrayList<PointF>()
|
|
|
|
+// Log.d(TAG, "point.size=${line.size}")
|
|
|
|
+// for (t in 0 until line.size) {
|
|
|
|
+// val p1 = line[t].split(",")
|
|
|
|
+// val point = PointF(p1[0].toFloat() * 20 + 12000, -p1[1].toFloat() * 20 -20600)
|
|
|
|
+// pointList.add(point)
|
|
// }
|
|
// }
|
|
|
|
+// scene.addItem(GraphyWallItem(pointList))
|
|
// }
|
|
// }
|
|
|
|
+// println()
|
|
|
|
+
|
|
return
|
|
return
|
|
} // Function loadWalls()
|
|
} // Function loadWalls()
|
|
|
|
|