clark преди 9 месеца
родител
ревизия
3aea826092

+ 2 - 2
app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 26
         targetSdkVersion 35
         compileSdk 35
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.0.1"
 
         /*
          最新端口号

+ 0 - 1
app/src/main/java/com/moodtalk/android/common/api/AppVersionServiceManager.java

@@ -3,7 +3,6 @@ package com.moodtalk.android.common.api;
 
 import com.moodtalk.android.common.api.service.ConfigService;
 import com.moodtalk.android.common.listener.HttpResponseListener;
-import com.moodtalk.android.home.model.AppNewVersion;
 import com.moodtalk.android.home.model.AppVersion;
 
 public class AppVersionServiceManager extends BaseServiceManager {

+ 2 - 2
app/src/main/java/com/moodtalk/android/common/api/service/ConfigService.java

@@ -10,6 +10,6 @@ import retrofit2.http.Path;
 
 public interface ConfigService {
 
-    @GET("config/map/{domain}")
-    Call<ApiResponse<AppVersion>> map(@Path("domain") String domain);
+    @GET("/version/{clientPlatform}")
+    Call<ApiResponse<AppVersion>> map(@Path("clientPlatform") String domain);
 }

+ 5 - 0
app/src/main/java/com/moodtalk/android/home/ui/HomeActivity.java

@@ -54,6 +54,7 @@ public class HomeActivity extends MessagingActivity<ActivityHomeBinding> impleme
 
         toolbar.setOnClickListener(this);
 
+        binding.header.ivScanQrCode.setOnClickListener(this);
         binding.tabhost.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
 
         binding.tabhost.addTab(binding.tabhost.newTabSpec(getString(R.string.common_message)).setIndicator(new TextView(this)).setContent(R.id.conversationFragment));
@@ -159,6 +160,10 @@ public class HomeActivity extends MessagingActivity<ActivityHomeBinding> impleme
     @Override
     public void onClick(View v)
     {
+        if (v.getId() == R.id.ivScanQrCode)
+        {
+            startActivityForResult(new Intent(this, ScanCodeActivity.class), IntentIntegrator.REQUEST_CODE);
+        }
         if (v == toolbar && binding.tabhost.getCurrentTab() == 0)
         {
             ConversationFragment fragment = (ConversationFragment) getSupportFragmentManager().findFragmentById(R.id.conversationFragment);

+ 1 - 0
app/src/main/res/layout/layout_home_toolbar.xml

@@ -25,6 +25,7 @@
             android:orientation="vertical">
 
             <ImageView
+                android:id="@+id/ivScanQrCode"
                 android:layout_width="26dp"
                 android:layout_height="26dp"
                 android:layout_marginTop="15dp"