liuzhenxing1118 3 years ago
parent
commit
608f5b577a

+ 12 - 1
.idea/deploymentTargetDropDown.xml

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/xp_360x400_API_33.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
     <targetSelectedWithDropDown>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
@@ -12,6 +23,6 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-07-26T06:03:52.983625Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-08-03T03:39:23.477101Z" />
   </component>
 </project>

+ 1 - 0
.idea/misc.xml

@@ -15,6 +15,7 @@
         <entry key="app/src/main/res/layout/activity_list_title.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3546195652173913" />
         <entry key="app/src/main/res/layout/activity_qr.xml" value="0.19300911854103345" />
+        <entry key="app/src/main/res/layout/activity_sourceannouncement.xml" value="0.625" />
         <entry key="app/src/main/res/layout/activity_wifi_list.xml" value="0.2807971014492754" />
         <entry key="app/src/main/res/layout/activity_wifi_login.xml" value="0.16236068895643363" />
         <entry key="app/src/main/res/layout/bright_activity.xml" value="0.1889564336372847" />

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

@@ -166,6 +166,10 @@
             android:name=".Activity.ApnDeleteActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".Activity.SourceAnnouncementActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
     </application>
 
 </manifest>

+ 23 - 2
app/src/main/java/com/xplora/xpsettings/Activity/AboutActivity.java

@@ -3,6 +3,7 @@ package com.xplora.xpsettings.Activity;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
+import android.content.Intent;
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -11,6 +12,8 @@ import android.os.Environment;
 import android.os.StatFs;
 import android.os.SystemProperties;
 import android.text.format.Formatter;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 
 import com.xplora.xpsettings.Adapter.BaseListAdapter;
@@ -47,13 +50,17 @@ public class AboutActivity extends BaseActivity {
         String imei = DataManager.getIMEI();
         String wifi = DataManager.getWifiMac();
 
-        String[] valueList = {modelName, cpu, ram, storage, softwareVersion, firmwareVersion, imei, wifi};
+        String[] valueList = {modelName, cpu, ram, storage, softwareVersion, firmwareVersion, imei, wifi, ""};
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
             model.subTitle = valueList[i];
             model.isShowArrow = false;
-            model.cellType = Constant.CellType.TITLE_SUBTITLE;
+            if (i == stringList.length-1) {
+                model.cellType = Constant.CellType.TITLE;
+            } else {
+                model.cellType = Constant.CellType.TITLE_SUBTITLE;
+            }
             mDataList.add(model);
         }
     }
@@ -62,6 +69,15 @@ public class AboutActivity extends BaseActivity {
         mAdapter = new BaseListAdapter(AboutActivity.this, 0, mDataList);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(mAdapter);
+
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (position == mDataList.size()-1) {
+                    openSourceAnnouncement();
+                }
+            }
+        });
     }
 
     public String getTotalInternalMemorySize(Context context) {
@@ -93,4 +109,9 @@ public class AboutActivity extends BaseActivity {
         }
         return Formatter.formatFileSize(context, initial_memory);// Byte转换为KB或者MB,内存大小规格化
     }
+
+    private void openSourceAnnouncement() {
+        Intent intent = new Intent(this, SourceAnnouncementActivity.class);
+        startActivity(intent);
+    }
 }

+ 28 - 0
app/src/main/java/com/xplora/xpsettings/Activity/SourceAnnouncementActivity.java

@@ -0,0 +1,28 @@
+package com.xplora.xpsettings.Activity;
+
+import android.annotation.SuppressLint;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.xplora.xpsettings.R;
+
+public class SourceAnnouncementActivity extends BaseActivity{
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sourceannouncement);
+        setWatchTitle(getResources().getStringArray(R.array.about_titls_array)[8]);
+
+        initView();
+    }
+
+    @SuppressLint("SetTextI18n")
+    private void initView() {
+        TextView textView = findViewById(R.id.mText);
+
+        String text1 = getString(R.string.source_announcement_1);
+        String text2 = getString(R.string.source_announcement_2);
+
+        textView.setText(text1 + "\n" + "\n" + text2);
+    }
+}

+ 44 - 0
app/src/main/res/layout/activity_sourceannouncement.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="18dp"
+        android:layout_marginTop="25dp"
+        android:textAlignment="center"
+        android:textSize="12sp"
+        android:textFontWeight="500"
+        android:textColor="#FFFFFFFF"
+        android:fontFamily="Roboto"
+        android:visibility="gone"
+        />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="5dp"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
+        tools:ignore="UselessParent"
+        >
+
+        <TextView
+            android:id="@+id/mText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAlignment="textStart"
+            android:textSize="10sp"
+            android:textFontWeight="300"
+            android:textColor="#FFFFFFFF"
+            android:fontFamily="Roboto"
+            />
+    </ScrollView>
+
+</LinearLayout>

+ 1 - 0
app/src/main/res/values/arrays.xml

@@ -80,6 +80,7 @@
         <item>Firmware version</item>
         <item>IMEI</item>
         <item>Wi-Fi mac</item>
+        <item>Open Source Announcement</item>
     </string-array>
 
     <string-array name="camero_titls_array">

+ 3 - 0
app/src/main/res/values/strings.xml

@@ -39,4 +39,7 @@
     <string name="apn_delete_content">Really want to delete this APN?</string>
 
     <string name="sound_mode">Sound Mode</string>
+
+    <string name="source_announcement_1">The software included in this product contains copyrighted software that is licensed under the GPL.</string>
+    <string name="source_announcement_2">If you would like to obtain the complete corresponding source code for a period of two years after the last shipment of this product by sending an email to support@xplora.com</string>
 </resources>