浏览代码

add poc2.0需求

lihao1 3 年之前
父节点
当前提交
01eb213560

+ 15 - 0
demo/build.gradle

@@ -61,6 +61,21 @@ android {
         }
     }
 
+    signingConfigs {
+        release {
+            storeFile file("persagy.keystore")
+            storePassword "persagy"
+            keyAlias "persagy"
+            keyPassword "persagy"
+        }
+        debug {
+            storeFile file("persagy.keystore")
+            storePassword "persagy"
+            keyAlias "persagy"
+            keyPassword "persagy"
+        }
+    }
+
     buildTypes {
         release {
             // minifyEnabled false

二进制
demo/persagy.keystore


+ 1 - 1
demo/src/main/java/com/framework/app/Constants.kt

@@ -4,7 +4,7 @@ package com.framework.app
  * 测试服务器 IP
  */
 //const val testIP = "http://192.168.0.48:8876/"
-const val testIP = "http://82.157.28.170:8876/"
+const val testIP = "http://192.168.0.48:8876/"
 
 const val tencentIP = "http://82.157.28.170:8876/"
 

+ 1 - 1
demo/src/main/java/com/framework/mvvm/model/db/entity/ObjectEntity.kt

@@ -33,7 +33,7 @@ data class ObjectEntity(
     @ColumnInfo(name = "create_app") val createApp: String?,        // 创建对象的应用
     @ColumnInfo(name = "creation_time") val creationTime: Long?,  // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,           // 修改人
-    @ColumnInfo(name = "modified_time") var modifiedTime: String?,   // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: Long?,   // 修改时间
     @ColumnInfo(name = "client_device") val clientDevice: String?,  // 标识客户端设备
     @ColumnInfo(name = "client_id") val clientId: String?,          // 客户端生成id
     @ColumnInfo(name = "update_app") val updateApp: String?,        // 更新对象的应用

+ 2 - 2
demo/src/main/java/com/framework/mvvm/model/db/entity/RelationEntity.kt

@@ -28,9 +28,9 @@ data class RelationEntity(
     @ColumnInfo(name = "create_app") val createApp: String?,         // 创建关系的App
     @ColumnInfo(name = "update_app") val updateApp: String?,         // 更新关系的App
     @ColumnInfo(name = "creator") val creator: String?,              // 创建人
-    @ColumnInfo(name = "creation_time") val creationTime: String?,   // 创建时间
+    @ColumnInfo(name = "creation_time") val creationTime: Long?,   // 创建时间
     @ColumnInfo(name = "modifier") val modifier: String?,            // 更新人
-    @ColumnInfo(name = "modified_time") var modifiedTime: String?,   // 修改时间
+    @ColumnInfo(name = "modified_time") var modifiedTime: Long?,   // 修改时间
     @ColumnInfo(name = "client_id") val clientId: String?,           // 客户端生成id
     @ColumnInfo(name = "client_device") val clientDevice: String?,   // 标识客户端设备
     @ColumnInfo(name = "upload_flag") val uploadFlag: String?,       // app端上传数据标记

+ 4 - 2
demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt

@@ -11,6 +11,8 @@ import com.framework.mvvm.model.db.entity.*
 import com.framework.mvvm.model.vo.AdmRequest
 import com.framework.mvvm.model.vo.Building
 import com.framework.mvvm.model.vo.UploadBuilding
+import java.text.DateFormat
+import java.text.SimpleDateFormat
 
 class AdmRepository(
     private val api: Api,
@@ -404,7 +406,7 @@ class AdmRepository(
                     }
                     objects.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        it.modifiedTime = result.timestampMillis
                         objectDao.insObject(it)
                     }
                     qrCodes.forEach {
@@ -414,7 +416,7 @@ class AdmRepository(
                     }
                     relations.forEach {
                         it.state = "2"
-                        it.modifiedTime = result.timestamp
+                        it.modifiedTime = result.timestampMillis
                         relationDao.insRelation(it)
                     }
                     problemArchs.forEach {

+ 3 - 1
demo/src/main/java/com/framework/mvvm/model/vo/UploadResult.kt

@@ -5,5 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class UploadResult(
-    val timestamp: String?
+    val timestamp: String?,
+    val buildId: String?,
+    val timestampMillis: Long?
 )

+ 1 - 0
demo/src/main/java/com/sybotan/android/demo/activities/EquipDetailActivity.kt

@@ -176,6 +176,7 @@ class EquipDetailActivity : BaseActivity(), View.OnTouchListener {
                 doneSwitch.isChecked, position!!
             )
         }
+        findViewById<ImageView>(R.id.back).setOnClickListener { finish() }
     }
 
     //重写onTouch方法

+ 3 - 2
demo/src/main/java/com/sybotan/android/demo/activities/SpaceDetailActivity.kt

@@ -124,6 +124,7 @@ class SpaceDetailActivity : BaseActivity() {
         btnSubmit.setOnClickListener {
             graphyVM.refreshObject(space, staticInfoAdapter.hashMap)
         }
+        findViewById<ImageView>(R.id.back).setOnClickListener { finish() }
     }
 
     private fun addPic() {
@@ -202,8 +203,8 @@ class SpaceDetailActivity : BaseActivity() {
                 }
                 LocalDataOperation.DEAL_DATA_NEXT -> {
                     ToastUtils.showMyToast("图片上传完毕")
-                    staticInfoAdapter.hashMap.put(info.code, Gson().toJson(beans))
-                    staticInfoAdapter.valueList.remove(info.code)
+                    staticInfoAdapter.hashMap.put("Photos", Gson().toJson(beans))
+                    staticInfoAdapter.valueList.clear()
                     staticInfoAdapter.notifyDataSetChanged()
                 }
                 LocalDataOperation.DEAL_DATA_ERROR -> {

+ 13 - 8
demo/src/main/java/com/sybotan/android/demo/adapter/StaticInfoAdapter.java

@@ -302,12 +302,6 @@ public class StaticInfoAdapter extends BaseRecyclerViewAdapter<Infos> {
 
     @SuppressLint("ClickableViewAccessibility")
     private void initEditTextTouch(EditText editText, Infos info) {
-        if (!valueList.contains(info.getCode())) {
-            if (hashMap != null && hashMap.get(info.getCode()) != null) {
-                editText.setText((String) hashMap.get(info.getCode()));
-            }
-        }
-        valueList.add(info.getCode());
         editText.setOnTouchListener((v, event) -> {
             if (MotionEvent.ACTION_DOWN == event.getAction()) {
                 v.getParent().requestDisallowInterceptTouchEvent(true);
@@ -316,7 +310,7 @@ public class StaticInfoAdapter extends BaseRecyclerViewAdapter<Infos> {
             }
             return false;
         });
-        editText.addTextChangedListener(new TextWatcher() {
+        TextWatcher textWatcher = new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
@@ -331,7 +325,18 @@ public class StaticInfoAdapter extends BaseRecyclerViewAdapter<Infos> {
             public void afterTextChanged(Editable s) {
                 hashMap.put(info.getCode(), s.toString());
             }
-        });
+        };
+        if (editText.getTag() instanceof TextWatcher) {
+            editText.removeTextChangedListener((TextWatcher) editText.getTag());
+        }
+        if (!valueList.contains(info.getCode())) {
+            if (hashMap != null && hashMap.get(info.getCode()) != null) {
+                editText.setText((String) hashMap.get(info.getCode()));
+            }
+        }
+        valueList.add(info.getCode());
+        editText.addTextChangedListener(textWatcher);
+        editText.setTag(textWatcher);
     }
 
     @Override

+ 1 - 0
demo/src/main/res/layout/activity_equip_detail.xml

@@ -18,6 +18,7 @@
             android:background="@color/white_ffffff">
 
             <ImageView
+                android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="16dp"

+ 1 - 0
demo/src/main/res/layout/activity_space_detail.xml

@@ -18,6 +18,7 @@
             android:background="@color/white_ffffff">
 
             <ImageView
+                android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="16dp"