Frankensteinly 1 жил өмнө
parent
commit
859c5e2451

+ 3 - 0
app/src/main/AndroidManifest.xml

@@ -21,6 +21,9 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.ISCS"
         tools:targetApi="31">
+        <activity
+            android:name=".activity.PresentationActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.SopActivity"
             android:exported="false" />

+ 4 - 0
app/src/main/java/com/grkj/iscs/activity/MainActivity.kt

@@ -37,5 +37,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         mBinding?.sop?.setOnClickListener {
             startActivity(Intent(this, SopActivity::class.java))
         }
+
+        mBinding?.presentation?.setOnClickListener {
+            startActivity(Intent(this, PresentationActivity::class.java))
+        }
     }
 }

+ 26 - 0
app/src/main/java/com/grkj/iscs/activity/PresentationActivity.kt

@@ -0,0 +1,26 @@
+package com.grkj.iscs.activity
+
+import android.os.Environment
+import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.databinding.ActivityPresentationBinding
+import com.grkj.iscs.iview.IPresentationView
+import com.grkj.iscs.presenter.PresentationPresenter
+import com.grkj.iscs.util.FileUtil
+
+class PresentationActivity :
+    BaseMvpActivity<IPresentationView, PresentationPresenter, ActivityPresentationBinding>() {
+
+    override val viewBinding: ActivityPresentationBinding
+        get() = ActivityPresentationBinding.inflate(layoutInflater)
+
+    override fun initView() {
+        val path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath + "/presentation/presentation.txt"
+        val str = FileUtil.readTxt(path)
+
+
+    }
+
+    override fun initPresenter(): PresentationPresenter {
+        return PresentationPresenter()
+    }
+}

+ 5 - 0
app/src/main/java/com/grkj/iscs/iview/IPresentationView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.iview
+
+import com.grkj.iscs.base.IView
+
+interface IPresentationView : IView {}

+ 6 - 0
app/src/main/java/com/grkj/iscs/presenter/PresentationPresenter.kt

@@ -0,0 +1,6 @@
+package com.grkj.iscs.presenter
+
+import com.grkj.iscs.base.BasePresenter
+import com.grkj.iscs.iview.IPresentationView
+
+class PresentationPresenter : BasePresenter<IPresentationView>() {}

+ 25 - 1
app/src/main/java/com/grkj/iscs/util/FileUtil.kt

@@ -2,8 +2,15 @@ package com.grkj.iscs.util
 
 import android.content.Context
 import android.os.Environment
-import java.io.*
+import java.io.BufferedInputStream
+import java.io.BufferedOutputStream
+import java.io.BufferedReader
+import java.io.File
 import java.io.File.separator
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.InputStreamReader
+
 
 class FileUtil {
     companion object{
@@ -112,5 +119,22 @@ class FileUtil {
             }
             return
         }
+
+        fun readTxt(path: String?): String {
+            var str = ""
+            try {
+                val urlFile = File(path)
+                val isr = InputStreamReader(FileInputStream(urlFile), "UTF-8")
+                val br = BufferedReader(isr)
+
+                var mimeTypeLine: String? = null
+                while ((br.readLine().also { mimeTypeLine = it }) != null) {
+                    str += mimeTypeLine
+                }
+            } catch (e: java.lang.Exception) {
+                e.printStackTrace()
+            }
+            return str
+        }
     }
 }

+ 86 - 64
app/src/main/res/layout/activity_main.xml

@@ -5,77 +5,99 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
+    android:orientation="vertical"
     android:gravity="center"
     tools:context=".activity.MainActivity">
 
-    <Button
-        android:id="@+id/ble"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="BLE"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center">
+        <Button
+            android:id="@+id/ble"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="BLE"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
 
-    <Button
-        android:id="@+id/modbus"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="ModBus"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+        <Button
+            android:id="@+id/modbus"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="ModBus"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
 
-    <Button
-        android:id="@+id/websocket"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="WebSocket"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+        <Button
+            android:id="@+id/websocket"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="WebSocket"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
 
-    <Button
-        android:id="@+id/http"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="HTTP"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+        <Button
+            android:id="@+id/http"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="HTTP"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
 
-    <Button
-        android:id="@+id/auth"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="AuthPage"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+        <Button
+            android:id="@+id/auth"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="AuthPage"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
 
-    <Button
-        android:id="@+id/home"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="HomePage"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+        <Button
+            android:id="@+id/home"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="HomePage"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
 
-    <Button
-        android:id="@+id/sop"
-        android:layout_width="80dp"
-        android:layout_height="50dp"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:text="SOP"
-        android:textSize="10sp"
-        android:layout_margin="5dp"/>
+        <Button
+            android:id="@+id/sop"
+            android:layout_width="80dp"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="SOP"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center">
+        <Button
+            android:id="@+id/presentation"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="Presentation"
+            android:textSize="10sp"
+            android:layout_margin="5dp"/>
+    </LinearLayout>
 </LinearLayout>

+ 10 - 0
app/src/main/res/layout/activity_presentation.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.PresentationActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 8 - 1
app/src/main/res/layout/item_rv_selectableinput_spinner.xml

@@ -3,10 +3,17 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="@dimen/rv_item_margin"
+    android:background="@color/white"
     android:orientation="horizontal">
 
     <TextView
         android:id="@+id/tv_option"
         style="@style/CommonTextView"
-        android:layout_width="match_parent" />
+        android:layout_width="match_parent"
+        android:textColor="@color/black" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/lfile_gray" />
 </LinearLayout>