commit 0416

app/src/main/AndroidManifest.xml

@@ -129,7 +129,7 @@
 
         <activity android:name=".activity.SiteManagement"  android:screenOrientation="portrait"/>
         <activity android:name=".activity.DevicedetailActivity"  android:screenOrientation="portrait"/>
-
+        <activity android:name=".activity.DevicedetailActivity1"  android:screenOrientation="portrait"/>
         <!-- <meta-data -->
         <!-- android:name="com.google.android.actions" -->
         <!-- android:resource="@xml/buttonstyle" /> -->

app/src/main/java/com/silence/commonframe/activity/Devicedetail3Activity.java

@@ -47,6 +47,8 @@ public class Devicedetail3Activity extends AppCompatActivity {
     private  MyAdapterSlide  adapter;
     private MyAdapterSlideSite adapter1;
     private  String deviceid;
+    private String RegionName;
+    private String Location;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -61,6 +63,8 @@ public class Devicedetail3Activity extends AppCompatActivity {
 
         Intent intent = getIntent();
         deviceid = intent.getStringExtra("deviceid");
+        RegionName = intent.getStringExtra("RegionName");
+        Location = intent.getStringExtra("Location");
 
       //  getData();
         getDevice();
@@ -78,6 +82,9 @@ public class Devicedetail3Activity extends AppCompatActivity {
             //    Toast.makeText(Devicedetail3Activity.this, "hello", Toast.LENGTH_SHORT).show();
                 Intent intent = new Intent(Devicedetail3Activity.this,DevicedetailActivity.class);
                 intent.putExtra("id",deviceid);
+                intent.putExtra("RegionName",RegionName);
+                intent.putExtra("Location",Location);
+                intent.putExtra("deviceId",list.get(position));
                 startActivity(intent);
 
 

app/src/main/java/com/silence/commonframe/activity/DevicedetailActivity.java

@@ -1,5 +1,6 @@
 package com.silence.commonframe.activity;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
@@ -64,6 +65,15 @@ public class DevicedetailActivity extends AppCompatActivity {
 //        //控件綁定適配器
 //        recView.setAdapter(adapter1);
 
+        Intent intent = getIntent();
+        //   String  deviceid1 = intent.getStringExtra("id");
+        String  RegionName = intent.getStringExtra("RegionName");
+        String  Location = intent.getStringExtra("Location");//deviceId
+        deviceid = intent.getStringExtra("deviceId");//设备编码ID
+        tvId.setText(deviceid);
+        tvPlace.setText("位        置："+RegionName);
+        tvPlace1.setText("详细地址："+Location);
+
 
         getDeviceDataChanged();
     }

app/src/main/java/com/silence/commonframe/activity/DevicedetailActivity1.java

@@ -0,0 +1,187 @@
+package com.silence.commonframe.activity;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.callback.StringCallback;
+import com.silence.commonframe.ApiService;
+import com.silence.commonframe.R;
+import com.silence.commonframe.adapter.MyAdapterSlideSite1;
+import com.silence.commonframe.model.DeviceDataChangedModel;
+import com.silence.commonframe.utils.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
+
+public class DevicedetailActivity1 extends AppCompatActivity {
+
+
+    @Bind(R.id.imageView4)
+    ImageView imageView4;
+    @Bind(R.id.tv_id)
+    TextView tvId;
+    @Bind(R.id.textView9)
+    TextView textView9;
+    @Bind(R.id.tv_place)
+    TextView tvPlace;
+    @Bind(R.id.tv_place1)
+    TextView tvPlace1;
+    @Bind(R.id.recView)
+    RecyclerView recView;
+    private String deviceid = "0000000000000051";
+    private List<HashMap<String, String>> listmap = new ArrayList<HashMap<String, String>>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_devicedetail);
+        ButterKnife.bind(this);
+
+        initWindows();
+
+//        recView.setLayoutManager(new LinearLayoutManager(this));
+//
+//        DeviceDetailRecViewAdapter adapter1 = new DeviceDetailRecViewAdapter(this, Data.getList());
+//        //控件綁定適配器
+//        recView.setAdapter(adapter1);
+
+        Intent intent = getIntent();
+   //   String  deviceid1 = intent.getStringExtra("id");
+      String  RegionName = intent.getStringExtra("place1");
+      String  Location = intent.getStringExtra("location");//deviceId
+         deviceid = intent.getStringExtra("id");//设备编码ID
+        tvId.setText(deviceid);
+        tvPlace.setText("位        置："+RegionName);
+        tvPlace1.setText("详细地址："+Location);
+
+
+        getDeviceDataChanged();
+    }
+
+
+    private void initWindows() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS
+                    | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+            window.setNavigationBarColor(Color.BLACK);
+        }
+    }
+
+    private void getDeviceDataChanged() {
+
+        //  http://www.hsh-iot.com/hsh-app/app/getDevice?page=1&pagesize=11&siteid=6204a38e285746cda8b329165f559126
+        //  String  url =   ApiService.httpUrl1 +"/app/getDevice?page="+page+"&pagesize=10&siteid="+ Data.getListid().get(position1);
+        String url = ApiService.httpUrl1 + "/app/getDeviceDataChanged?page=1&pagesize=10&devideid=" + deviceid;//deviceId  deviceid
+        OkGo.get(url)
+                .tag(this)                       // 请求的 tag, 主要用于取消对应的请求
+                .cacheKey("cacheGetKey")            // 设置当前请求的缓存key,建议每个不同功能的请求设置一个
+                .cacheMode(CacheMode.DEFAULT)    // 缓存模式，详细请看缓存介绍
+                .headers("token", Data.getToken())
+                .execute(new StringCallback() {
+                    @Override
+                    public void onSuccess(String s, Call call, Response response) {
+                        //   mTextView2.setText(s);
+                        //   System.out.println("sss"+s);
+                        //    Toast.makeText(getContext(),"s"+s,Toast.LENGTH_SHORT).show();
+
+                        DeviceDataChangedModel deviceDataChangedModel = new Gson().fromJson(s, DeviceDataChangedModel.class);
+                        List<DeviceDataChangedModel.DataBean> listBeans = deviceDataChangedModel.getData();
+                        System.out.println("ss" + listBeans);
+                    //    if (listBeans.size() != 0) {
+                            for (int i = 0; i < listBeans.size(); i++) {
+
+
+                                HashMap<String, String> hashMap = new HashMap<>();
+                                String inputtime = listBeans.get(i).getInputtime();
+                                String deviceStatus = listBeans.get(i).getDeviceStatus() + "";
+                                String signalStrength = listBeans.get(i).getSignalStrength() + "";
+                                String batteryVoltage = listBeans.get(i).getBatteryVoltage() + "";
+                                String mcuTemp = listBeans.get(i).getMcuTemp() + "";
+
+
+                                hashMap.put("inputtime", inputtime);
+                                hashMap.put("deviceStatus", deviceStatus);
+                                hashMap.put("signalStrength", signalStrength);
+                                hashMap.put("batteryVoltage", batteryVoltage);
+                                hashMap.put("mcuTemp", mcuTemp);
+
+                                listmap.add(hashMap);
+                            }
+
+
+                            runOnUiThread(new Runnable() {
+
+
+                                @Override
+                                public void run() {
+
+                                    // number = listBeans.size();
+//                                    imageView.setVisibility(View.GONE);
+//                                    bt.setVisibility(View.GONE);
+//                                    recyclerView.setVisibility(View.VISIBLE);
+
+
+//                                    adapter = new MyAdapterSlide(getContext(), listmap);
+//                                    recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+//                                    recyclerView.setAdapter(adapter);
+
+
+//                                    adapter1 = new MyAdapterSlideSite(Devicedetail3Activity.this, listmap);
+//                                    recyclerView.setLayoutManager(new LinearLayoutManager(Devicedetail3Activity.this));
+//                                    recyclerView.setAdapter(adapter1);
+
+
+                            //        recView.setLayoutManager(new LinearLayoutManager(this));
+//
+//        DeviceDetailRecViewAdapter adapter1 = new DeviceDetailRecViewAdapter(this, Data.getList());
+//        //控件綁定適配器
+//        recView.setAdapter(adapter1);
+
+                                    recView.setLayoutManager(new LinearLayoutManager(DevicedetailActivity1.this));
+                               //      DeviceDetailRecViewAdapter adapter1 = new DeviceDetailRecViewAdapter(DevicedetailActivity.this, listmap);
+                                    MyAdapterSlideSite1 adapter1 = new MyAdapterSlideSite1(DevicedetailActivity1.this, listmap);
+
+                                    recView.setAdapter(adapter1);
+                                }
+                            });
+
+
+                    //    }
+
+
+                    }
+
+                });
+
+
+    }
+
+
+    public void myclick(View view) {
+        finish();
+    }
+}

app/src/main/java/com/silence/commonframe/fragment/DeviceFragment.java

@@ -25,6 +25,7 @@ import com.silence.commonframe.activity.AddSiteActivity;
 import com.silence.commonframe.activity.AdddeviceActivity;
 import com.silence.commonframe.activity.CommonScanActivity;
 import com.silence.commonframe.activity.DevicedetailActivity;
+import com.silence.commonframe.activity.DevicedetailActivity1;
 import com.silence.commonframe.adapter.ListViewAdapter;
 import com.silence.commonframe.adapter.MyAdapter;
 import com.silence.commonframe.adapter.MyAdapterSlide;
@@ -70,6 +71,7 @@ public class DeviceFragment extends Fragment {
 
    private     Device jsonBean;
    private  Device1 siteDevice;
+    private String  location;
 
 
 
@@ -135,7 +137,11 @@ public class DeviceFragment extends Fragment {
                     //   Toast.makeText(MainActivity.this, "** " + mList.get(position) + " **", Toast.LENGTH_SHORT).show();
 
                  //   Toast.makeText(getContext(), "hello", Toast.LENGTH_SHORT).show();
-                    Intent intent = new Intent(getContext(),DevicedetailActivity.class);
+                    Intent intent = new Intent(getContext(),DevicedetailActivity1.class);
+
+                    intent.putExtra("place1",place1 );
+                    intent.putExtra("location",location);
+                    intent.putExtra("id",list.get(position));
                     startActivity(intent);
 
 
@@ -662,6 +668,9 @@ public class DeviceFragment extends Fragment {
                    place = Data.getListlocation().get(position);
 //                place1 = Data.getListregionalism().get(position);
 
+                place1 = Data.getListmapRegionName().get(position);
+
+                location  = Data.getListlocation().get(position);
 
 
 

app/src/main/java/com/silence/commonframe/fragment/FirstFragment.java

@@ -160,7 +160,9 @@ public class FirstFragment extends Fragment  {
 
     Handler handler=new Handler();
 
-
+    private ArrayList<String> listRegionName = new ArrayList<String>();//故障场所区域名称R
+    private ArrayList<String> listLocation = new ArrayList<String>();//故障场所区域名称
+    private ArrayList<String> listregionalism1 = new ArrayList<String>();//所有场所的名称
 
 
 
@@ -375,6 +377,12 @@ public class FirstFragment extends Fragment  {
                     Intent intent = new Intent(getContext(),Devicedetail3Activity.class);
                  //   intent.putExtra("deviceid",listid.get(position1));  //listSiteid
                     intent.putExtra("deviceid",listSiteid1.get(position1));
+
+                    intent.putExtra("RegionName",listRegionName.get(position1));
+                    intent.putExtra("Location",listLocation.get(position1));
+
+
+
                     startActivity(intent);
                 }
             }
@@ -824,7 +832,8 @@ public class FirstFragment extends Fragment  {
                             hashMap.put("id",id);
 
 
-
+                            listRegionName.add(RegionName);
+                            listLocation.add(Location);
 
 //                            listid.add(id);
                            listSiteid1.add(siteId);
@@ -1028,6 +1037,7 @@ public class FirstFragment extends Fragment  {
                             String Location = listBeans.get(i).getLocation();
                             String id = listBeans.get(i).getId();
                             String  deployment  = listBeans.get(i).getDeployment();
+                            String regionName = listBeans.get(i).getRegionName();
 
 
                             hashMap.put("RegionName",RegionName);
@@ -1043,6 +1053,7 @@ public class FirstFragment extends Fragment  {
 
                             listlocation.add(Location);//listregionalism
                             listmap.add(hashMap);
+                            listregionalism1.add(regionName);//所有场所的区域名称
                         }
 
 
@@ -1054,6 +1065,7 @@ public class FirstFragment extends Fragment  {
 
                         Data.setListlocation(listlocation);//场所注册的地址在设备页面提提使用
                         Data.setListid(listid);  //场所id1
+                        Data.setListmapRegionName(listregionalism1);
 
 //                        getActivity().runOnUiThread(new Runnable() {
 //                            @Override

app/src/main/java/com/silence/commonframe/utils/Data.java

@@ -35,6 +35,16 @@ public class Data {
 
     private static String cb_message  = "0";  //场所短信提示
 
+    public static ArrayList<String> getListmapRegionName() {
+        return listmapRegionName;
+    }
+
+    public static void setListmapRegionName(ArrayList<String> listmapRegionName) {
+        Data.listmapRegionName = listmapRegionName;
+    }
+
+    private static  ArrayList<String> listmapRegionName;//全部的场所获取的区域名称
+
 
     public static int getTestId() {
         return testId;

app/src/main/res/layout/activity_devicedetail.xml

@@ -77,7 +77,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="110dp"
+            android:layout_height="118dp"
             android:layout_marginTop="4dp"
             android:orientation="vertical"
             android:layout_marginLeft="10dp">
@@ -145,14 +145,14 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="运  营  商：" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="电信NO-IOT"/>
 
                             <View
@@ -175,7 +175,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="编" />
 
                             <TextView
@@ -189,7 +189,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="号：" />
 
                             <TextView
@@ -197,7 +197,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="A898793479347" />
 
 
@@ -224,7 +224,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="位         置：海智海3栋" />
 
 
@@ -240,7 +240,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="详细地址：杭州市余杭区海智海3栋" />
 
 
@@ -266,7 +266,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="电池电压：" />
 
                             <TextView
@@ -275,7 +275,7 @@
                                 android:layout_height="wrap_content"
 
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="NULL" />
                         </LinearLayout>
 
@@ -288,7 +288,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="网关状态：" />
 
                             <TextView
@@ -297,7 +297,7 @@
                                 android:layout_height="wrap_content"
 
                                 android:textColor="@color/myblack"
-                                android:textSize="14sp"
+                                android:textSize="11sp"
                                 android:text="在线  " />
                         </LinearLayout>
                     </LinearLayout>