Эх сурвалжийг харах

除主键外其他字段调整为String

carlos 3 жил өмнө
parent
commit
6223319537

+ 1 - 0
.idea/misc.xml

@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/40877/Documents/workspace/ChatProvider/app/src/main/res/layout/activity_main.xml" value="0.35520833333333335" />
+        <entry key="..\:/40877/Documents/workspace/XPContactProvider/app/src/main/res/layout/activity_main.xml" value="0.7333333333333334" />
       </map>
     </option>
   </component>

BIN
XPContactProvider.apk


+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -37,7 +37,7 @@
 
         <provider
             android:name=".provider.WatchContactProvider"
-            android:authorities="com.xplora.WatchChatProvider"
+            android:authorities="com.xplora.WatchContactProvider"
             android:exported="true"
             android:enabled="true"
             android:permission="com.xplora.provider"/>

+ 0 - 1
app/src/main/java/com/xplora/contactprovider/TestUtil.kt

@@ -3,7 +3,6 @@ package com.xplora.contactprovider
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.net.Uri
-import android.util.Log
 
 class TestUtil {
     companion object {

+ 4 - 4
app/src/main/java/com/xplora/contactprovider/dao/ContactInfo.kt

@@ -45,7 +45,7 @@ data class ContactInfo(
      * - 100 : Unknown.
      */
     @SerializedName("sim")
-    var sim: Int? = null,
+    var sim: String? = null,
     /**
      * - 1 : First guardian(SOS target)
      * - 2 : Second guardian
@@ -53,11 +53,11 @@ data class ContactInfo(
      * - 4 : Friend
      */
     @SerializedName("type")
-    var type: Int? = null,
+    var type: String? = null,
     @SerializedName("rate")
-    var rate: Int? = null,
+    var rate: String? = null,
     @SerializedName("unRead")
-    var unRead: Int? = null,
+    var unRead: String? = null,
     @SerializedName("profilePath")
     var profilePath: String? = null
 ) {

+ 0 - 37
app/src/main/java/com/xplora/contactprovider/provider/WatchContactProvider.kt

@@ -33,43 +33,6 @@ class WatchContactProvider : ContentProvider() {
     override fun onCreate() = context?.let {
         db = Room.databaseBuilder(it, ContactDatabase::class.java, TABLE_NAME_CONTACT)
             .build()
-
-/*        val contentValues1 = ContentValues()
-        contentValues1.put("id", "1")
-        contentValues1.put("userId", "4e6f7g8h")
-        contentValues1.put("name", "test_Guardian_1")
-        contentValues1.put("phoneNumber", "13500000000")
-        contentValues1.put("countryPN", "+86")
-        contentValues1.put("sim", 2)
-        contentValues1.put("type", 1)
-        insert(Uri.parse("content://com.xplora.WatchContactProvider/contact"), contentValues1)
-
-        val contentValues2 = ContentValues()
-        contentValues2.put("id", "2")
-        contentValues2.put("userId", "f8f9f0f1f2")
-        contentValues2.put("name", "test_Guardian_2")
-        contentValues2.put("phoneNumber", "13500000001")
-        contentValues2.put("countryPN", "+1")
-        contentValues2.put("sim", 1)
-        contentValues2.put("type", 2)
-        insert(Uri.parse("content://com.xplora.WatchContactProvider/contact"), contentValues2)
-
-        val contentValues3 = ContentValues()
-        contentValues3.put("name", "test_General")
-        contentValues3.put("phoneNumber", "13500000002")
-        contentValues3.put("countryPN", "+66")
-        contentValues3.put("sim", 2)
-        contentValues3.put("type", 3)
-        insert(Uri.parse("content://com.xplora.WatchContactProvider/contact"), contentValues3)
-
-        val contentValues4 = ContentValues()
-        contentValues2.put("userId", "xxxxpppp")
-        contentValues4.put("name", "test_Friend")
-        contentValues4.put("phoneNumber", "13500000003")
-        contentValues4.put("countryPN", "+886")
-        contentValues4.put("sim", 2)
-        contentValues4.put("type", 4)
-        insert(Uri.parse("content://com.xplora.WatchContactProvider/contact"), contentValues4)*/
         true
     } ?: false
 

+ 8 - 0
app/src/main/res/layout/activity_main.xml

@@ -15,4 +15,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Button"
+        tools:layout_editor_absoluteX="43dp"
+        tools:layout_editor_absoluteY="24dp" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>