Ver Fonte

+ WA888 change UI Main in progress

Dola TENG há 2 anos atrás
pai
commit
a964066962

+ 1 - 1
app/build.gradle

@@ -81,7 +81,7 @@ android {
         variant.outputs.all {
             //def formattedDate = new Date().format('yyyy-MM-dd HH-mm')
 
-            def appName = "Khmer9_Yuki"
+            def appName = "SBCMAIN"
             def appId = variant.applicationId
             def versionName = variant.versionName
             def versionCode = variant.versionCode

BIN
app/src/main/assets/yuki.apk


+ 4 - 0
app/src/main/java/com/khmer9/sbcmain/app/ShareActivity.kt

@@ -2,6 +2,7 @@ package com.khmer9.sbcmain.app
 
 import android.content.Intent
 import android.os.Bundle
+import android.os.StrictMode
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -28,6 +29,9 @@ class ShareActivity : BaseActivity() {
     lateinit var sharePref: PrefHelper
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        val builder: StrictMode.VmPolicy.Builder = StrictMode.VmPolicy.Builder()
+        StrictMode.setVmPolicy(builder.build())
+
         ModelPreferencesManager.get<LoginData>(Const.USER_KEY)?.let {
             loginData = it
         }

+ 33 - 0
app/src/main/java/com/khmer9/sbcmain/screen/main/MainFragment.kt

@@ -2,7 +2,9 @@ package com.khmer9.sbcmain.screen.main
 
 import android.annotation.SuppressLint
 import android.content.Intent
+import android.content.res.AssetManager
 import android.media.MediaPlayer
+import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import android.view.View
@@ -21,6 +23,9 @@ import com.khmer9.sbcmain.remote.service.ConnectivityStates
 import com.khmer9.sbcmain.screen.report.StatementFragment
 import com.khmer9.sbcmain.screen.setting.SettingFragment
 import com.khmer9.sbcmain.screen.splash.SplashScreenActivity
+import java.io.File
+import java.io.InputStream
+import java.io.OutputStream
 
 
 class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
@@ -143,6 +148,34 @@ class MainFragment : BaseFragment(R.layout.layout_fragment_main_yuki) {
                                     startActivity(launchIntent)
                                 } else {
                                     //installed
+                                    val assetManager: AssetManager = assets
+                                    var inputStream: InputStream? = null
+                                    var outPutStream: OutputStream? = null
+
+                                    try {
+                                        inputStream = assetManager.open("yuki.apk")
+                                        val buffer = ByteArray(1024)
+
+                                        var read: Int
+
+                                        while (inputStream.read(buffer).also { read = it } !== -1) {
+                                            outPutStream?.write(buffer, 0, read)
+                                        }
+
+
+                                        inputStream.close()
+                                        inputStream = null
+
+                                        outPutStream?.flush()
+                                        outPutStream?.close()
+                                        outPutStream = null
+
+                                        val intent: Intent = Intent(Intent.ACTION_VIEW)
+                                        intent.setDataAndType(Uri.fromFile(File("/sdcard/" + "yuki.apk")), "application/vnd.android.package-archive")
+                                        startActivity(intent)
+                                    } catch (e: Exception) {
+                                        e.printStackTrace()
+                                    }
                                 }
                             }
                         }

+ 0 - 14
app/src/main/java/com/khmer9/sbcmain/screen/report/StatementFragment.kt

@@ -148,20 +148,6 @@ class StatementFragment : BaseFragment(R.layout.fragment_report) {
 
             shareViewModel.remoteReportWithdrawStatement()
         }
-
-        v_tab4.setOnClickListener {
-            bg_select_tab1.visibility = View.INVISIBLE
-            bg_select_tab2.visibility = View.INVISIBLE
-            bg_select_tab3.visibility = View.INVISIBLE
-            bg_select_tab4.visibility = View.VISIBLE
-
-            rvTab1.visibility = View.INVISIBLE
-            rvTab2.visibility = View.INVISIBLE
-            tab3.visibility = View.INVISIBLE
-            rvTab4.visibility = View.VISIBLE
-
-            shareViewModel.remoteReportResultStatement()
-        }
     }
 
     private fun getReport(state: ReportViewState) {

+ 6 - 30
app/src/main/res/layout/fragment_report.xml

@@ -62,28 +62,18 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="@+id/tv_table"
-        app:layout_constraintEnd_toStartOf="@+id/v_tab4"
+        app:layout_constraintEnd_toStartOf="@+id/v_tab2"
         app:layout_constraintStart_toStartOf="@id/tv_table"
         app:layout_constraintTop_toTopOf="@+id/tv_table" />
 
-    <View
-        android:id="@+id/v_tab4"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/v_tab1"
-        app:layout_constraintEnd_toEndOf="@id/v_tab2"
-        app:layout_constraintStart_toEndOf="@+id/v_tab1"
-        app:layout_constraintTop_toTopOf="@+id/v_tab1" />
-
     <View
         android:id="@+id/v_tab2"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="@+id/v_tab4"
+        app:layout_constraintBottom_toBottomOf="@+id/v_tab1"
         app:layout_constraintEnd_toStartOf="@+id/v_tab3"
-        app:layout_constraintStart_toEndOf="@id/v_tab4"
-        app:layout_constraintTop_toTopOf="@+id/v_tab4" />
+        app:layout_constraintStart_toEndOf="@id/v_tab1"
+        app:layout_constraintTop_toTopOf="@+id/v_tab1" />
 
     <View
         android:id="@+id/v_tab3"
@@ -107,20 +97,6 @@
         app:layout_constraintStart_toStartOf="@id/v_tab1"
         app:layout_constraintTop_toTopOf="@+id/v_tab1" />
 
-    <TextView
-        android:id="@+id/img_tab4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:text="@string/result_statement"
-        android:textColor="@color/color_white"
-        android:textSize="11sp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/v_tab4"
-        app:layout_constraintEnd_toEndOf="@+id/v_tab4"
-        app:layout_constraintStart_toStartOf="@id/v_tab4"
-        app:layout_constraintTop_toTopOf="@+id/v_tab4" />
-
     <TextView
         android:id="@+id/img_tab2"
         android:layout_width="wrap_content"
@@ -164,8 +140,8 @@
         android:background="@color/color_white"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/tv_table"
-        app:layout_constraintEnd_toEndOf="@+id/v_tab4"
-        app:layout_constraintStart_toStartOf="@id/v_tab4" />
+        app:layout_constraintEnd_toEndOf="@+id/v_tab1"
+        app:layout_constraintStart_toStartOf="@id/v_tab1" />
 
     <View
         android:id="@+id/bg_select_tab2"